From 0113c4c9eb49e26aee006787c9564c1165909926 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Mar 2024 13:06:09 +0000 Subject: gentoo auto-resync : 06:03:2024 - 13:06:09 --- net-mail/Manifest.gz | Bin 14048 -> 14046 bytes net-mail/dovecot/Manifest | 2 + net-mail/dovecot/dovecot-2.3.21-r1.ebuild | 302 +++++++++++++++++++++++++ net-mail/dovecot/files/dovecot-typo-push.patch | 27 +++ 4 files changed, 331 insertions(+) create mode 100644 net-mail/dovecot/dovecot-2.3.21-r1.ebuild create mode 100644 net-mail/dovecot/files/dovecot-typo-push.patch (limited to 'net-mail') diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz index 5fdf84cac79f..c257fd9691a4 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 7b80d0623f51..ea1630662b67 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -3,6 +3,7 @@ AUX dovecot-2.3.19.1-slibtool.patch 2935 BLAKE2B b54beb9364aba2e326249f41c77efd4 AUX dovecot-autoconf-lua-version-v2.patch 524 BLAKE2B a0cb51a21169e55fe0ae92ed7fad3ccc898585ed4b0c9ed3db243b6f41165d5a4ad6470a6a76f5a04a44d450068da1b7173707f272f65a72265d4b49a630ac2e SHA512 cc9319926f90a4c4aaf1d1e77944bfa5df9f7f15ee9581469ff8c1a069ef18e55addb69fcfe88e024cad8544c0efb90f5b83c2b6d803e0c68770467849d31f78 AUX dovecot-openssl-3.patch 1345 BLAKE2B 282d18622d3a7eaab800ffda97a7bb72c242a505b228cd0f233394bb6d65bf5facc8f7576e73ba043bef11c8389da9f9bd211803819e5825c14843d8ba29b81d SHA512 b24db39cce6c388ab85eab7a9c161eb10ee871f5d78c7778e40a43acc3711486b4259dbbaef40c54efce55d3c8ca7cc8841adbe8528d75c6e8d60ba08b75df79 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349 +AUX dovecot-typo-push.patch 1217 BLAKE2B 813fcaf232fab6579aff27d636a902156d5a302c8ba5a7d522ab1021a2a1785ebcea8e1e2e6eb315c16c00c60c7633574ca48e41024b6225361b1a4d265fd84f SHA512 d66b7dd623b00086fee5e2b1c841f0e62339910c151cb758b71277ddfeda5009b58f1d74f61b2f1763fa44a4424d5d89ad5f5b5004eaefec1c02c79a80bec596 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063 DIST dovecot-2.3-pigeonhole-0.5.20.tar.gz 1945126 BLAKE2B 6845896f9bcfb26f74b0ecbc8109cfc2cd67492742aea2459cd74695d165c6009552b7178f370e06281440270829decc3f5fad9590b984ca3ff10267f4cf3e02 SHA512 45683e6bd678db00fc3e3c61d27a264d30d0e9aeb9ceb7ab55f94f0317d387056fa092e266062117cbe2a9dc2c90ddca03d154e78aad9c0d61fe8cf2c9187603 DIST dovecot-2.3-pigeonhole-0.5.21.tar.gz 1955945 BLAKE2B 91c4f5b2c21ef0f74ea4661abb94bd86beda6449642ec8ef6b2f48e86b370f78eb6b63f2ffb382cff500137a6723b6b4589548c3b8e415f0caf36c2e6b8b7cf4 SHA512 5537444025a474ee1b79919a424e24530695aec639361c531257f25fac286673719d476906d99d47e348deb57baa75419bff7dd284c82d2b751334dedec96314 @@ -11,5 +12,6 @@ DIST dovecot-2.3.21.tar.gz 7837242 BLAKE2B 50d0b614e163240e798d272e4435dd51b498b EBUILD dovecot-2.3.20-r1.ebuild 8665 BLAKE2B 2b438a509e9c954b9f731ec8f71f8e1601d3d0e9ceea602d3c2245cd92fd78edfacbff3a17580a34f80929cd6c623a46ba2dd7b675c666224e39c5ebfcd70f8f SHA512 0499f4d65287fb6274b32f7b12a2a66efaeb35c72fbff9f67cdbf569e7a7d24ad5ff22f4eb81ac19a18c34774e66ef07156d000e0e8a6e17687d11522becf432 EBUILD dovecot-2.3.20-r2.ebuild 8676 BLAKE2B c15fe5c43a1d9ac0b6430cefe5cf233cb8874517789b4692c9b4c8de51ae5348d8f1f2aa598c5b31457f55597342bf7ab50e5dbb343af5757a3537bcf17eeedf SHA512 908a471a114d580205b97855a46ab6f17e092bf2869edff023fc43578e2b7777b70ac9374b3533a10d27d5cb778a1fb57025803edd79e660cfb3d1d994a92cae EBUILD dovecot-2.3.20-r3.ebuild 8682 BLAKE2B 9c53d65244e6f81bbc06c327a10a69b106e7cd5612908a0c92c8de58d51311d896fb1d022961d3b95806f3150cd58ead83dcc85bb057a1760322416b95d87af7 SHA512 7869d9d31fda17d9e9fd0ebba02d86cbda4492be14a438621657cfd84c4ddd7dd4d5797a22afd02729313c01b9246d3ab80dda603aa2e390c7dbf7d516e55eb6 +EBUILD dovecot-2.3.21-r1.ebuild 8718 BLAKE2B 0e16cfbd87165913ac4216817d7a2c886ef43100d31d8b4e2dbf43a19eb3f4852bc880ce56da66bd31a41873a200cefd5d21f10d6ad39bf26d12ed5552f7f3e1 SHA512 d9f3cef45ab589eec2b518c19c7737973204174f01c1ed0d78e19a9c13f22d6b5057f7e0276af12b55014c01e415b24c824b4b5b343fee3791a300b041392636 EBUILD dovecot-2.3.21.ebuild 8682 BLAKE2B d0df8f987f10d102f7a85e258be351e1ba0468169e6851f913e137ac39a93a956e623e0d4b596ebdc81f618a647548829a163d3065717e9b1b68fc9b865aac28 SHA512 75a89b88182817b45a0a58b8e2022a17c359a5ed00de96bc19b6fff48eb70015ea1dfa14acb069b3aaf062e9c57f79bfdb70517721cdf2cf3df28341c2fea3a4 MISC metadata.xml 901 BLAKE2B fdc5511093672f5f3d685b6b9f3e8f6da2c5d39b86ce9a7407cce420d4333863f9a17ded8e6e89a78af1b5567f1a575a1fe7b5e9276640a3e0d8f0b9ffcb6316 SHA512 288a5812cc4880a10fa615c860649fe7809a0ebc8a6cc4e13352c1f21f94264bd2700241cb479891b84660b9f5202cdcd4a2c28c2da70980bffa191583571fd7 diff --git a/net-mail/dovecot/dovecot-2.3.21-r1.ebuild b/net-mail/dovecot/dovecot-2.3.21-r1.ebuild new file mode 100644 index 000000000000..0d5076e6371f --- /dev/null +++ b/net-mail/dovecot/dovecot-2.3.21-r1.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2024 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.21" +if [[ ${PV} == *_rc* ]]; then + rc_dir="rc/" +else + rc_dir="" +fi + +DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" +HOMEPAGE="https://www.dovecot.org/" +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 + ) " +S="${WORKDIR}/${MY_P}" +LICENSE="LGPL-2.1 MIT" +SLOT="0/${PV}" +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 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[pam?] + " + +PATCHES=( + "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch + "${FILESDIR}/${PN}"-socket-name-too-long.patch + "${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631 + "${FILESDIR}"/CVE-2022-30550.patch + "${FILESDIR}/${PN}"-openssl-3.patch + "${FILESDIR}/${PN}"-typo-push.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, 782631 + #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() { + # bug #340791 and bug #807178 + local -x NOVALGRIND=true + + 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 + + # 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: Tue, 5 Mar 2024 18:15:58 -0800 +Subject: [PATCH] push-notification: fix typo 'module' to '-module' + +There is a typo in the Makefile.am where it has 'module` instead of '-module' which causes a build failure with slibtool. + + ld: cannot find module: No such file or directory + +With GNU libtool the typo is silently ignored. +--- + src/plugins/push-notification/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/push-notification/Makefile.am b/src/plugins/push-notification/Makefile.am +index f1527148a0..daa43a2d4d 100644 +--- a/src/plugins/push-notification/Makefile.am ++++ b/src/plugins/push-notification/Makefile.am +@@ -75,7 +75,7 @@ lib22_push_notification_lua_plugin_la_CFLAGS = $(AM_CPPFLAGS) \ + -I$(top_srcdir)/src/lib-lua \ + -I$(top_srcdir)/src/plugins/mail-lua \ + $(LUA_CFLAGS) +-lib22_push_notification_lua_plugin_la_LDFLAGS = module -avoid-version ++lib22_push_notification_lua_plugin_la_LDFLAGS = -module -avoid-version + module_LTLIBRARIES += \ + lib22_push_notification_lua_plugin.la + lib22_push_notification_lua_plugin_la_LIBADD = $(notify_deps) $(LUA_LIBS) -- cgit v1.2.3