From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- net-mail/Manifest.gz | Bin 14735 -> 14735 bytes net-mail/dovecot/Manifest | 2 + net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild | 303 +++++++++++++++++++++ net-mail/dovecot/files/CVE-2022-30550.patch | 155 +++++++++++ net-mail/grepmail/Manifest | 4 - .../5.30.33-fix_nonexistent_mailbox_test.patch | 33 --- net-mail/grepmail/files/5.30.33-midnight.patch | 17 -- net-mail/grepmail/grepmail-5.30.33-r2.ebuild | 44 --- net-mail/mhonarc-gentoo/Manifest | 4 +- .../mhonarc-gentoo-2.6.18-archives-gentoo.patch | 63 ++--- .../mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild | 28 -- .../mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild | 28 ++ net-mail/mu/Manifest | 10 +- net-mail/mu/files/mu-1.7.12-gcc12.patch | 12 - net-mail/mu/files/mu-1.7.12-optional-mu4e.patch | 41 --- net-mail/mu/mu-1.6.11.ebuild | 71 ----- net-mail/mu/mu-1.7.23.ebuild | 90 ------ net-mail/mu/mu-1.8.1.ebuild | 89 ------ net-mail/mu/mu-1.8.5.ebuild | 88 ++++++ net-mail/public-inbox/Manifest | 2 + net-mail/public-inbox/public-inbox-1.8.0.ebuild | 38 +++ net-mail/queue-repair/Manifest | 2 +- net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild | 2 +- 23 files changed, 650 insertions(+), 476 deletions(-) create mode 100644 net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild create mode 100644 net-mail/dovecot/files/CVE-2022-30550.patch delete mode 100644 net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch delete mode 100644 net-mail/grepmail/files/5.30.33-midnight.patch delete mode 100644 net-mail/grepmail/grepmail-5.30.33-r2.ebuild delete mode 100644 net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild create mode 100644 net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r3.ebuild delete mode 100644 net-mail/mu/files/mu-1.7.12-gcc12.patch delete mode 100644 net-mail/mu/files/mu-1.7.12-optional-mu4e.patch delete mode 100644 net-mail/mu/mu-1.6.11.ebuild delete mode 100644 net-mail/mu/mu-1.7.23.ebuild delete mode 100644 net-mail/mu/mu-1.8.1.ebuild create mode 100644 net-mail/mu/mu-1.8.5.ebuild create mode 100644 net-mail/public-inbox/public-inbox-1.8.0.ebuild (limited to 'net-mail') diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz index 7562f9360622..f49404e48828 100644 Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index a6c8a517cfb9..91eb332dd940 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,3 +1,4 @@ +AUX CVE-2022-30550.patch 5745 BLAKE2B ae48938734cceefa05473fa1d055e5d85c27f8a73ac4ed24debb631d83efbd1a1c94dd3629514d193abf5810d9adbf609c6cfc077d2a9de3e37d7429311ef86e SHA512 b2ff67fd8b6c5cea93877651a1168ef1a5d399cc5f1a61d1cce407c7624f5b6d758996084c6a5714b6880de0ce11ce5eac74a1e02918758cb6983caedb651c58 AUX dovecot-autoconf-lua-version-v2.patch 524 BLAKE2B a0cb51a21169e55fe0ae92ed7fad3ccc898585ed4b0c9ed3db243b6f41165d5a4ad6470a6a76f5a04a44d450068da1b7173707f272f65a72265d4b49a630ac2e SHA512 cc9319926f90a4c4aaf1d1e77944bfa5df9f7f15ee9581469ff8c1a069ef18e55addb69fcfe88e024cad8544c0efb90f5b83c2b6d803e0c68770467849d31f78 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063 @@ -6,5 +7,6 @@ DIST dovecot-2.3-pigeonhole-0.5.19.tar.gz 1954148 BLAKE2B 0c52293f9447260f3e95f3 DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233 DIST dovecot-2.3.19.1.tar.gz 7790851 BLAKE2B 6826977a0febfcb56eb99baf6e0dc0a130fc24a14f113ca7ce0f72b26b8c9755d8352999c5965e21320a62621787e02428c99dd6888768e8c35a46e4082ba071 SHA512 ceb87a5f76b6352d28fd030aae5ad2165a133e9a8a6309891e793911203fc0ada9fb254dc05d183eaaa7e2b9851d3f1755b33f08fa6ff5b4b415ac4272bfe150 EBUILD dovecot-2.3.18-r1.ebuild 8859 BLAKE2B a022d5c3fb0da72559ecd071711ca2bbea7dbd999a75449f7b6e50047d74497895ad00a74de6c0653e61d78f76600d5aab9204133476558ee6c59b1628180438 SHA512 e3c1b3f2733a348344d3349091622b0e3827bdedd4575fef0ada44d13346f22bef33ef9817540c2cc5c15fd6142050a36bfdc32ecf905a64ee67e3283e6c6981 +EBUILD dovecot-2.3.19.1-r1.ebuild 8689 BLAKE2B a02875e7f8404cc3f404b66cfbce96c095c89e5ff83eb65a9104f02d81f524017eed3565bcd4b802ab119387956862dffbfa8e15d13e28e03f612fe09e1ad477 SHA512 b5d45fe0ce376eee7991f737b2e61dccb344683b924d1ec581cdf3d50c736d5a2904e71b332aca0453db17ff66bf796d4b93c2b34817d6a536ab08f016e36b46 EBUILD dovecot-2.3.19.1.ebuild 8658 BLAKE2B d9edf93a3287d299403509f0991f1c0a976207a2693ee62404a323803c22574ced457503297c209432f0d2a942be60780a40e913f62c11e3d600449d63a481ff SHA512 85c3138977452eb8ef341d5c67c30694230606d47dccec99feea37efafb8d9e6fa956fbe6d43d3e3670cc3183e0a26cf390e264f634ed7e97d2acbe5a8a62f29 MISC metadata.xml 1025 BLAKE2B 5e9309f0cf659eb51dbf908776fd0f6a97c06c305380ff0b66f969d92382c78e1460310b0d4dd323e1193d622f5bd9cc796d31e8bda304e833d5ab974b934992 SHA512 befdb4837de276d9a73a77a926d972dae9a6c5a39a28137d4ef8f1e9e51c4885b8df24b8a144b9ba5d9533af7430ea531cada49944d529651bf63bc98aeff92f diff --git a/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild new file mode 100644 index 000000000000..9d580a135e17 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.3.19.1-r1.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 lua5-3 ) +# do not add a ssl USE flag. ssl is mandatory +SSL_DEPS_SKIP=1 +inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs + +MY_P="${P/_/.}" +#MY_S="${PN}-ce-${PV}" +major_minor="$(ver_cut 1-2)" +sieve_version="0.5.19" +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 ~riscv ~s390 ~sparc x86" + +IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite" +IUSE_DOVECOT_COMPRESS="lz4 zstd" +IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc + selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind" + +IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + dev-libs/icu:= + dev-libs/openssl:0= + sys-libs/zlib:= + virtual/libiconv + argon2? ( dev-libs/libsodium:= ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + lucene? ( >=dev-cpp/clucene-2.3 ) + lz4? ( app-arch/lz4 ) + mysql? ( dev-db/mysql-connector-c:0= ) + pam? ( sys-libs/pam:= ) + postgres? ( dev-db/postgresql:* ) + rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) + selinux? ( sec-policy/selinux-dovecot ) + solr? ( net-misc/curl dev-libs/expat ) + sqlite? ( dev-db/sqlite:* ) + stemmer? ( dev-libs/snowball-stemmer:= ) + suid? ( acct-group/mail ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + textcat? ( app-text/libexttextcat ) + unwind? ( sys-libs/libunwind:= ) + zstd? ( app-arch/zstd:= ) + virtual/libcrypt:= + " + +RDEPEND=" + ${DEPEND} + acct-group/dovecot + acct-group/dovenull + acct-user/dovecot + acct-user/dovenull + net-mail/mailbase + " + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch + "${FILESDIR}/${PN}"-socket-name-too-long.patch + "${FILESDIR}"/CVE-2022-30550.patch +) + +pkg_setup() { + use lua && lua-single_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 + + # Bug #727244 + append-cflags -fasynchronous-unwind-tables +} + +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 \ + LUAPC="${ELUA}" \ + systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + econf \ + --with-rundir="${EPREFIX}/run/dovecot" \ + --with-statedir="${EPREFIX}/var/lib/dovecot" \ + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + --disable-rpath \ + --with-bzlib \ + --without-libbsd \ + --with-lzma \ + --with-icu \ + --with-ssl \ + --with-zlib \ + $( use_with argon2 sodium ) \ + $( use_with caps libcap ) \ + $( use_with kerberos gssapi ) \ + $( use_with lua ) \ + $( use_with ldap ) \ + $( use_with lucene ) \ + $( use_with lz4 ) \ + $( use_with mysql ) \ + $( use_with pam ) \ + $( use_with postgres pgsql ) \ + $( use_with sqlite ) \ + $( use_with solr ) \ + $( use_with stemmer ) \ + $( use_with systemd ) \ + $( use_with tcpd libwrap ) \ + $( use_with textcat ) \ + $( use_with unwind libunwind ) \ + $( 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 ldap ) \ + $( 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 + + 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 = +Date: Mon, 9 May 2022 15:23:33 +0300 +Subject: [PATCH 1/2] auth: Fix handling passdbs with identical driver/args but + different mechanisms/username_filter + +The passdb was wrongly deduplicated in this situation, causing wrong +mechanisms or username_filter setting to be used. This would be a rather +unlikely configuration though. + +Fixed by moving mechanisms and username_filter from struct passdb_module +to struct auth_passdb, which is where they should have been in the first +place. +--- + src/auth/auth-request.c | 6 +++--- + src/auth/auth.c | 18 ++++++++++++++++++ + src/auth/auth.h | 5 +++++ + src/auth/passdb.c | 15 ++------------- + src/auth/passdb.h | 4 ---- + 5 files changed, 28 insertions(+), 20 deletions(-) + +diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c +index cd08b1fa02..0ca29f3674 100644 +--- a/src/auth/auth-request.c ++++ b/src/auth/auth-request.c +@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request, + struct auth_passdb *passdb) + { + /* if mechanism is not supported, skip */ +- const char *const *mechs = passdb->passdb->mechanisms; +- const char *const *username_filter = passdb->passdb->username_filter; ++ const char *const *mechs = passdb->mechanisms; ++ const char *const *username_filter = passdb->username_filter; + const char *username; + + username = request->fields.user; +@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request, + return TRUE; + } + +- if (passdb->passdb->username_filter != NULL && ++ if (passdb->username_filter != NULL && + !auth_request_username_accepted(username_filter, username)) { + auth_request_log_debug(request, + request->mech != NULL ? AUTH_SUBSYS_MECH +diff --git a/src/auth/auth.c b/src/auth/auth.c +index f2f3fda20c..9f6c4ba60c 100644 +--- a/src/auth/auth.c ++++ b/src/auth/auth.c +@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set, + auth_passdb->override_fields_tmpl = + passdb_template_build(auth->pool, set->override_fields); + ++ if (*set->mechanisms == '\0') { ++ auth_passdb->mechanisms = NULL; ++ } else if (strcasecmp(set->mechanisms, "none") == 0) { ++ auth_passdb->mechanisms = (const char *const[]){ NULL }; ++ } else { ++ auth_passdb->mechanisms = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->mechanisms, " ,"); ++ } ++ ++ if (*set->username_filter == '\0') { ++ auth_passdb->username_filter = NULL; ++ } else { ++ auth_passdb->username_filter = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->username_filter, " ,"); ++ } ++ + /* for backwards compatibility: */ + if (set->pass) + auth_passdb->result_success = AUTH_DB_RULE_CONTINUE; +diff --git a/src/auth/auth.h b/src/auth/auth.h +index f700e29d5c..460a179765 100644 +--- a/src/auth/auth.h ++++ b/src/auth/auth.h +@@ -41,6 +41,11 @@ struct auth_passdb { + struct passdb_template *default_fields_tmpl; + struct passdb_template *override_fields_tmpl; + ++ /* Supported authentication mechanisms, NULL is all, {NULL} is none */ ++ const char *const *mechanisms; ++ /* Username filter, NULL is no filter */ ++ const char *const *username_filter; ++ + enum auth_passdb_skip skip; + enum auth_db_rule result_success; + enum auth_db_rule result_failure; +diff --git a/src/auth/passdb.c b/src/auth/passdb.c +index eb4ac8ae82..f5eed1af4f 100644 +--- a/src/auth/passdb.c ++++ b/src/auth/passdb.c +@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set) + passdb->id = ++auth_passdb_id; + passdb->iface = *iface; + passdb->args = p_strdup(pool, set->args); +- if (*set->mechanisms == '\0') { +- passdb->mechanisms = NULL; +- } else if (strcasecmp(set->mechanisms, "none") == 0) { +- passdb->mechanisms = (const char *const[]){NULL}; +- } else { +- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,"); +- } +- +- if (*set->username_filter == '\0') { +- passdb->username_filter = NULL; +- } else { +- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,"); +- } ++ /* NOTE: if anything else than driver & args are added here, ++ passdb_find() also needs to be updated. */ + array_push_back(&passdb_modules, &passdb); + return passdb; + } +diff --git a/src/auth/passdb.h b/src/auth/passdb.h +index 2e95328e5c..e466a9fdb6 100644 +--- a/src/auth/passdb.h ++++ b/src/auth/passdb.h +@@ -63,10 +63,6 @@ struct passdb_module { + /* Default password scheme for this module. + If default_cache_key is set, must not be NULL. */ + const char *default_pass_scheme; +- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/ +- const char *const *mechanisms; +- /* Username filter, NULL is no filter */ +- const char *const *username_filter; + + /* If blocking is set to TRUE, use child processes to access + this passdb. */ + +From a1022072e2ce36f853873d910287f466165b184b Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 16 May 2022 14:58:45 +0200 +Subject: [PATCH 2/2] auth: Add a comment about updating userdb_find() + +--- + src/auth/userdb.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/auth/userdb.c b/src/auth/userdb.c +index 0849659102..830bc2dd64 100644 +--- a/src/auth/userdb.c ++++ b/src/auth/userdb.c +@@ -158,7 +158,8 @@ userdb_preinit(pool_t pool, const struct auth_userdb_settings *set) + userdb->id = ++auth_userdb_id; + userdb->iface = iface; + userdb->args = p_strdup(pool, set->args); +- ++ /* NOTE: if anything else than driver & args are added here, ++ userdb_find() also needs to be updated. */ + array_push_back(&userdb_modules, &userdb); + return userdb; + } diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest index 11af79be57f3..c90ec03177ce 100644 --- a/net-mail/grepmail/Manifest +++ b/net-mail/grepmail/Manifest @@ -1,7 +1,3 @@ -AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 BLAKE2B ebcc4958fc773f4ee0d1156f6ffbb722fc985d641c5e9b4a7fb1f12de90faf85808c74719271b99159572f86244aba2ef98adeffc106392f22e636d12738bede SHA512 88c3123ea5031a9d925cf8c7464b53290a4015faf43b2ef5a0543698d8374e45b93291bf1eefe636b52ba4a8d1a9ebf2dc3a9261572bfd5bcc9f16f1671e8969 -AUX 5.30.33-midnight.patch 560 BLAKE2B 4b2d085dc8f334f1ec1a9949ef91524791c841a5bb6b92a69c90d87ec62aaa4280558e8a57112b6d085beb34551a1b42662ae6a5311ffc5f60da6d5b9b8520c3 SHA512 41ce56d0a2371bcc527f997825530e87ad0199c78605ea72567255cb985158fa56e669aeea966a547ccd970231bda1a5da783320fda1568642890e9832c69775 -DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f DIST grepmail-5.3111.tar.gz 560547 BLAKE2B 88c9e841aed419ae428c45dd9a1bfb294076d73a3635e06b50a1f5b3bb3d2d447a8c586054b80ad793ccd6b2b2cb16394486d044f988c5760c04f9fe2da0e73e SHA512 50df6585ecebb838a2b60c048e66588d7a161a88256ffce2c7313e61d32751739b3c30a64deb43dcd2a5933970cacc812fbb2dbd9f91a8ac34012e0581cd2962 -EBUILD grepmail-5.30.33-r2.ebuild 1039 BLAKE2B d906e5707d8704752811797b7964aa63732aaeb369d209e237247c7ad1d66d2667a7ce1df70bbfb959148698e3ab8ffa2ba3a8f51b496049c505f3822c413c31 SHA512 9582058ef44dd1dfea0cf0230a7ad66be28dededcdaa2f2b5590d3168d41c176ad1ddb893596d97fd1cc699320a2e488b1a0555a1be5ea9074d4b02957ae36e0 EBUILD grepmail-5.3111.ebuild 687 BLAKE2B 90630630731805fd859b793187c7cd9553ed8b3c4c85b9395e932c73da57c8627f437addc1d5f3953ff1b9624fbe920bff4142c3a8374a891e584725842ec92a SHA512 fa068b49907cdd2c0f501dc0bffc6b4f440d0540447cb7591b1705bcf00c56fae7d04be2283a7c04c31cb0a896870808d40c730dc32ba5437cdd4e10096bd369 MISC metadata.xml 246 BLAKE2B e117fa7ba84c2250c8699ba7658f09aeefda0f7977dc851b17ab79b20e9c139e94de32b755136f4a7e901d0a2cecf6e3a8fc88521d1eb2767dcdc07c8f43fd37 SHA512 43283f70e6e72dc2211754908e9bb54668d4f0d569ebff77890b291868a27d08abf9d530de1be10e72cf0ac95c24a7ff491490b90a30104364f1b6fd93147354 diff --git a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch deleted file mode 100644 index cdab28bb635c..000000000000 --- a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Fix FTBFS with libmail-mbox-messageparser-perl 1.5002 - From 1.5002, it does not return "No data on standard input" anymore. -Author: Vincent Legout -Last-Update: 2010-04-28 -Bug-Debian: http://bugs.debian.org/549782 -Bug-Gentoo: https://bugs.gentoo.org/296657 - ---- grepmail/t/nonexistent_mailbox.t -+++ grepmail/t/nonexistent_mailbox.t -@@ -13,21 +13,15 @@ - => ['none','no_such_file'], - "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . - " | grepmail pattern" -- => ['none','no_data'], -+ => ['none','none'], - "grepmail -E $single_quote\$email =~ /pattern/$single_quote no_such_file" - => ['none','no_such_file'], - "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . - " | grepmail -E $single_quote\$email =~ /pattern/$single_quote" -- => ['none','no_data'], -+ => ['none','none'], - ); - - my %expected_errors = ( --"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . -- " | grepmail pattern" -- => 1, --"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() . -- " | grepmail -E $single_quote\$email =~ /pattern/$single_quote" -- => 1, - ); - - my %localization = ( diff --git a/net-mail/grepmail/files/5.30.33-midnight.patch b/net-mail/grepmail/files/5.30.33-midnight.patch deleted file mode 100644 index d861774df81a..000000000000 --- a/net-mail/grepmail/files/5.30.33-midnight.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix bug with midnight -Author: Manuel Prinz -Last-Update: 2010-02-22 -Bug-Debian: http://bugs.debian.org/559588 -Bug-Gentoo: https://bugs.gentoo.org/355067 - ---- grepmail/grepmail -+++ grepmail/grepmail -@@ -397,7 +397,7 @@ - if (eval 'require Date::Manip') - { - my ($version_number) = $Date::Manip::VERSION =~ /^(\d+\.\d+)/; -- Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43; -+ Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43 and $version_number < 6; - } - } - diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild deleted file mode 100644 index c02c6360e139..000000000000 --- a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator perl-module - -MY_P="${PN}-$(delete_version_separator 2)" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates" -HOMEPAGE="https://github.com/coppit/grepmail" -SRC_URI="mirror://sourceforge/grepmail/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-perl/Inline - dev-perl/TimeDate - dev-perl/Date-Manip - virtual/perl-Digest-MD5 - >=dev-perl/Mail-Mbox-MessageParser-1.40.01 -" -DEPEND="${RDEPEND} -" -# test? ( dev-perl/Mail-Mbox-MessageParser ) - -# 100% failure on running -DIST_TEST="skip" - -PATCHES=( - "${FILESDIR}"/5.30.33-fix_nonexistent_mailbox_test.patch - "${FILESDIR}"/5.30.33-midnight.patch -) - -src_prepare() { - sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} diff --git a/net-mail/mhonarc-gentoo/Manifest b/net-mail/mhonarc-gentoo/Manifest index 3ef9b2ad26e0..1f1f7b6a4a3b 100644 --- a/net-mail/mhonarc-gentoo/Manifest +++ b/net-mail/mhonarc-gentoo/Manifest @@ -1,4 +1,4 @@ -AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 6534 BLAKE2B 32bb00808fd084445442c69c3689cb2d2efbb149e52a6a0f2375a89116eddc239c0d997ab2274e486ff475b0aea9cbbc94b0380c64afb07060dc25edd700b659 SHA512 f4c238e3394df9fccf1cefe697a2f5a53fdda5f02498ed5cd6d9adb301f49b257b8f01bf486a00ebd49b128d8707b8699a6e08cf3e3548709cbd29dca12e3d92 +AUX mhonarc-gentoo-2.6.18-archives-gentoo.patch 5666 BLAKE2B 97368c21d6e17a5791bc6e888df3105e437bd82594aa5780ac60c103de011d397fdeaf1f1c4b92cb36ba0dc3c15f175562f4f0400d65ea9ab92a26d3eded1dab SHA512 146680d6558d4b7139ceead0a6c7010af1a91010bccf7b802621cbc02753e516025e4d33b9c2c870b5317c1121b75282f4ed007d9919157450dad5168fc7a891 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511 -EBUILD mhonarc-gentoo-2.6.18-r2.ebuild 752 BLAKE2B c2f88a28593eaa69d89fc310a972f30ed01725c0a4d694376767b00e29b389caaba2334c888b51891099630b1c429fb2ded4a19fd5954ed6873ceccc93c46872 SHA512 f5240bed8951ec02cfd0506ec14375c705770f450e7cbf8d8c8dc49460c2f1e87a21c2b29803eb87f9acaf0c23d57b4067ed081657911fb62e478157e0af78d7 +EBUILD mhonarc-gentoo-2.6.18-r3.ebuild 751 BLAKE2B a82c7bdde8fc9ad44f65b76f951cf065cd579e3d1177287b73acedd178715f46a7007768a6ce52b1ec9d69c7d924919856ea47c139797a3e4e74ce44ebe103b5 SHA512 635dcf4440d278a1f380652f8d3728774abc7ebc9b0fa95f57255a7b0d8afa255d5a50783fc6ea12fad16e0093f7b2b0c8a4c8a11b1ca155220aa9eec95f26aa MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch index d67c63e4b95f..7f1f894882d5 100644 --- a/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch +++ b/net-mail/mhonarc-gentoo/files/mhonarc-gentoo-2.6.18-archives-gentoo.patch @@ -1,6 +1,5 @@ -diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl ---- a/lib/mhamain.pl 2006-06-10 02:42:58.000000000 +0000 -+++ b/lib/mhamain.pl 2008-01-27 14:12:48.000000000 +0000 +--- a/lib/mhamain.pl ++++ b/lib/mhamain.pl @@ -73,6 +73,8 @@ TERM TRAP USR1 USR2 VTALRM XCPU XFSZ ); @@ -10,7 +9,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl ############################################################################### ## Public routines ############################################################################### -@@ -934,6 +936,16 @@ +@@ -936,6 +938,16 @@ } else { $ctype = 'text/plain'; } @@ -26,8 +25,8 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl + } ## Insure uniqueness of index - $index .= $X . sprintf('%d',(defined($msgnum)?$msgnum:($LastMsgNum+1))); -@@ -955,6 +967,7 @@ + my $t = $index; +@@ -961,6 +973,7 @@ $Subject{$index} = $sub; $MsgHead{$index} = htmlize_header($fields); $ContentType{$index} = $ctype; @@ -35,7 +34,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl if ($msgid) { $MsgId{$msgid} = $index; $NewMsgId{$msgid} = $index; # Track new message-ids -@@ -966,6 +979,7 @@ +@@ -972,6 +985,7 @@ } else { $IndexNum{$index} = getNewMsgNum(); } @@ -43,7 +42,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl $Refs{$index} = [ @refs ] if (@refs); -@@ -1102,7 +1116,7 @@ +@@ -1121,7 +1135,7 @@ my $adding = ($ADD && !$force && !$SINGLE); my $i_p0 = fmt_msgnum($msgnum); @@ -52,7 +51,7 @@ diff -Nuar a/lib/mhamain.pl b/lib/mhamain.pl my $filepathname = join($DIRSEP, $OUTDIR, $filename); my $tmppathname; -@@ -1160,7 +1174,9 @@ +@@ -1179,7 +1193,9 @@ "\n", "