diff options
Diffstat (limited to 'net-mail/cyrus-imapd')
4 files changed, 305 insertions, 0 deletions
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest index b71c98d1e8b1..6ae62adee9ea 100644 --- a/net-mail/cyrus-imapd/Manifest +++ b/net-mail/cyrus-imapd/Manifest @@ -1,3 +1,5 @@ +AUX cyrus-imapd-3.4.4-0001-Test-for-libm.patch 925 BLAKE2B 9011250df2c6a1cad4ae276b777e9e7bbe82fe50c76684eb876a97279612aadad1d264480adfb695a00d8fa50709d2728b2395b53c7559540fc21cdbac5255e0 SHA512 3339367ed754c41aac09e10ba3281e5c432f362a963255e93a47b6e41342f187c7fc67a474032f0bf888d586335f587d92f82066de9dc586641e3fb12cc7ccae +AUX cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch 789 BLAKE2B b9cedc49c4b5445189887372c0b4ec365d6727b82aaaa40e0a54dddc3e7fed73bc5b7a29c90bc3d7a47cd34f9fad13df5b43e8f6a6cee12e6c110367653be155 SHA512 ac55e006234d7567daece1acf77cd1c6f30ce23316ab3450635a08fa38d3e7f125c824a74e77fe46678b873b7f3f84d6232a5b2599ef63a3adc7acc57cdc3ce0 AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6 AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20 @@ -13,5 +15,6 @@ EBUILD cyrus-imapd-3.0.16-r2.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a11871 EBUILD cyrus-imapd-3.0.17-r1.ebuild 6022 BLAKE2B 619618570289290e0a697e9280a18f249ef8898d1324f77f43b8ae0b275694f7b4f94b34ad822e4c90a923ed86b5d542d8b232e3a762aa093f353c0aad721f74 SHA512 17bc28ca592afc4c6a29fc765738c41c753e1f58996c40017d24c81584bf58493bc9e619ed36b4a6b6c90003cc9c4cd6e392f89a7b252bde16ed07af30240dbc EBUILD cyrus-imapd-3.4.2-r2.ebuild 5964 BLAKE2B d3b7b21d6da88a922562ab86a32995c89c4e18b550b20eef3e1f7c7b152262b01c0b57839b12acbe7afff20be07908557a43669eb853c1cf44ad2899a3cdba30 SHA512 c7645c12b7506b83f7db973eea2719f9fb4ce902ac312338df9c5a2faca0e22520c8af04c9e0e65348b672d61796789952b910a8e60b8476c876360e05d85d63 EBUILD cyrus-imapd-3.4.3-r2.ebuild 6312 BLAKE2B e9bf941312e9e622202abadc96e292449eb546c8dc8c432175ec15c723ddb18a5d46a66f86e4a93bbe5235c65458b14b6894d401b69879835a7598acf5fbaf7a SHA512 97056231855cdce65e008aa8b4bb56bd79c2c617606df61e0e662c7c818521567b04f7677b67684f06d87d813d4053d98b5d9b0ba61a1a68c08b9fba64a71527 +EBUILD cyrus-imapd-3.4.4-r1.ebuild 6444 BLAKE2B 00f0928504030c9b9a9c71a4e942d03f0f961874b57dc76b412a09a6466af6da52e719b8986dc29e2b618d2f9d1da462f13a6f2a583c77b37ed6e83306c383b5 SHA512 01ac21c48a563c10451dd5009a9fe70bd4e3680d715f8e130d1e4cd6074cfa0c5c0b032318314e86cf296040608c01713e3a7d30a913783f715b80daaf718833 EBUILD cyrus-imapd-3.4.4.ebuild 6310 BLAKE2B 66761b9e92172e16c8978ee9ba69cc503361bc1113eb68745b548cac58cde82c2c95f3536905f59722174c4c0cd7dc1f984a84d2729710b068600d7cf52f1f47 SHA512 00bfb7282ac4fc410d417b852b183e241381ebbeee592def7f11883dc9552303fa91a487b44ab411c1a0332a60bae198eb480ece4d986825afa349dd47e00f41 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild new file mode 100644 index 000000000000..b1811815cfe3 --- /dev/null +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html! +inherit autotools flag-o-matic pam ssl-cert + +DESCRIPTION="The Cyrus IMAP Server" +HOMEPAGE="https://www.cyrusimap.org/" +SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD-with-attribution GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="afs backup calalarm caps clamav http kerberos ldap \ + mysql nntp pam perl postgres replication +server sieve \ + sqlite ssl static-libs tcpd test xapian" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/libpcre:3 + >=dev-libs/cyrus-sasl-2.1.13:2 + dev-libs/jansson:= + dev-libs/icu:= + sys-apps/util-linux + sys-fs/e2fsprogs:= + sys-libs/zlib:= + afs? ( net-fs/openafs ) + calalarm? ( dev-libs/libical:= ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + http? ( + app-arch/brotli:= + app-arch/zstd:= + dev-libs/libxml2 + dev-libs/libical:= + net-libs/nghttp2:= + sci-libs/shapelib:= + ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + nntp? ( !net-nntp/leafnode ) + pam? ( + >=net-mail/mailbase-1 + sys-libs/pam + ) + perl? ( + dev-lang/perl:= + virtual/perl-Term-ReadLine + ) + postgres? ( dev-db/postgresql:* ) + ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] ) + sqlite? ( dev-db/sqlite:3 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xapian? ( >=dev-libs/xapian-1.4.0:= )" +# all blockers really needed? +# file collision with app-arch/dump - bug 619584 +RDEPEND="${DEPEND} + acct-group/mail + acct-user/cyrus + !mail-mta/courier + !net-mail/bincimap + !net-mail/courier-imap + !net-mail/uw-imap + !app-arch/dump" +DEPEND+=" test? ( dev-util/cunit )" +BDEPEND="sys-devel/flex + virtual/pkgconfig + virtual/yacc" + +REQUIRED_USE="afs? ( kerberos ) + backup? ( sqlite ) + calalarm? ( http ) + http? ( sqlite )" + +# https://bugs.gentoo.org/678754 +# TODO: check underlinking for other libraries +#PATCHES=( +# "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" +#) + +PATCHES=( + "${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch + "${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch +) + +src_prepare() { + default + + # Fix master(8)->cyrusmaster(8) manpage. + for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do + sed -i -e 's:master\.8:cyrusmaster.8:g' \ + -e 's:master(8):cyrusmaster(8):g' \ + "${i}" || die "sed failed" || die "sed failed" + done + mv man/master.8 man/cyrusmaster.8 || die "mv failed" + sed -i -e "s:MASTER:CYRUSMASTER:g" \ + -e "s:Master:Cyrusmaster:g" \ + -e "s:master:cyrusmaster:g" \ + man/cyrusmaster.8 || die "sed failed" + + # lock.h to afs/lock.h + sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \ + ptclient/afskrb.c || die + + eautoreconf +} + +src_configure() { + local myconf + + # bug #604466 + append-ldflags $(no-as-needed) + + # Workaround runtime crash + # bug #834573 + append-flags -fno-toplevel-reorder + + if use afs ; then + myconf+=" --with-afs-libdir=/usr/$(get_libdir)" + myconf+=" --with-afs-incdir=/usr/include/afs" + fi + + # TODO: + # - revisit --with-sphinx-build=no? (it's docs this time, not the search engine) + # - post-emerge message re lmdb removal? + econf \ + --enable-murder \ + --enable-idled \ + --enable-autocreate \ + --enable-pcre \ + --with-com_err \ + --with-cyrus-user=cyrus \ + --with-sasl \ + --with-sphinx-build=no \ + --without-krb \ + --without-krbdes \ + --enable-squat \ + --with-zlib \ + --without-wslay \ + --without-chardet \ + --without-cld2 \ + --disable-srs \ + $(use_enable afs) \ + $(use_enable afs krb5afspts) \ + $(use_enable backup) \ + $(use_enable calalarm calalarmd) \ + $(use_with caps libcap) \ + $(use_with clamav) \ + $(use_enable nntp) \ + $(use_enable http) \ + $(use_with http nghttp2) \ + $(use_enable replication) \ + $(use_enable kerberos gssapi) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with perl) \ + $(use_with sqlite) \ + $(use_with ssl openssl) \ + $(use_enable server) \ + $(use_enable sieve) \ + $(use_enable static-libs static) \ + $(use_with tcpd libwrap) \ + $(use_enable xapian) \ + $(use_enable test unit-tests) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" INSTALLDIRS=vendor install + + dodoc README* + dodoc -r doc + + cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die + rm -f doc/text/Makefile* || die + + mv "${ED}"/usr/libexec/{master,cyrusmaster} || die + + insinto /etc + newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf + newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf + + sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \ + -e '/^partition-default/s|/var/.*|/var/spool/imap|' \ + -e '/^sievedir/s|/var/.*|/var/imap/sieve|' \ + "${ED}"/etc/imapd.conf || die + + sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \ + -e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \ + "${ED}"/etc/cyrus.conf || die + + # turn off sieve if not installed + if ! use sieve; then + sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die + fi + + # same thing for http(s) as well + if ! use http; then + sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die + fi + + newinitd "${FILESDIR}"/cyrus.rc8 cyrus + newconfd "${FILESDIR}"/cyrus.confd cyrus + newpamd "${FILESDIR}"/cyrus.pam-include sieve + + for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do + keepdir "/var/${subdir}" + fowners cyrus:mail "/var/${subdir}" + fperms 0750 "/var/${subdir}" + done + + for subdir in imap/{user,quota,sieve} spool/imap ; do + for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do + keepdir "/var/${subdir}/${i}" + fowners cyrus:mail "/var/${subdir}/${i}" + fperms 0750 "/var/${subdir}/${i}" + done + done +} + +pkg_preinst() { + if ! has_version ${CATEGORY}/${PN} ; then + elog "For correct logging add the following to /etc/syslog.conf:" + elog " local6.* /var/log/imapd.log" + elog " auth.debug /var/log/auth.log" + echo + + elog "You have to add user cyrus to the sasldb2. Do this with:" + elog " saslpasswd2 cyrus" + fi +} + +pkg_postinst() { + # do not install server.{key,pem) if they exist + if use ssl ; then + if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then + install_cert /etc/ssl/cyrus/server + chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem} + fi + fi + + einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html" + einfo "for upgrade instructions." +} diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch new file mode 100644 index 000000000000..4a3d197ef57b --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch @@ -0,0 +1,32 @@ +https://github.com/cyrusimap/cyrus-imapd/pull/4235 +https://bugs.gentoo.org/721466 + +From e23a32e0516803b99ae18f0c4d5d42b59a2af111 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 15 Sep 2022 00:55:20 +0100 +Subject: [PATCH 1/2] Test for libm + +Test for -lm to avoid hardcoding it. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.am ++++ b/Makefile.am +@@ -1729,7 +1729,7 @@ master_master_SOURCES = \ + master/masterconf.c \ + master/masterconf.h \ + master/service.h +-master_master_LDADD = lib/libcyrus_min.la $(LIBS) $(GCOV_LIBS) -lm ++master_master_LDADD = lib/libcyrus_min.la $(LIBS) $(GCOV_LIBS) $(LIBM) + + + netnews_remotepurge_SOURCES = \ +--- a/configure.ac ++++ b/configure.ac +@@ -143,6 +143,7 @@ if test $ac_cv_sys_long_file_names = no; then + AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names) + fi + AC_C_INLINE ++LT_LIB_M + + gl_VISIBILITY + AH_BOTTOM([#if HAVE_VISIBILITY diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch new file mode 100644 index 000000000000..5a96cdb7c1c1 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch @@ -0,0 +1,23 @@ +https://github.com/cyrusimap/cyrus-imapd/pull/4235 +https://bugs.gentoo.org/721466 + +From 6fb292c3a071febfdb514589f12cc8d4b7329b53 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 15 Sep 2022 00:54:51 +0100 +Subject: [PATCH 2/2] Avoid underlinking libcyrus (-lm) + +Fixes building with lld. + +Bug: https://bugs.gentoo.org/721466 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.am ++++ b/Makefile.am +@@ -1538,7 +1538,7 @@ lib_libcyrus_la_SOURCES += lib/nonblock_fcntl.c + else + lib_libcyrus_la_SOURCES += lib/nonblock_ioctl.c + endif +-lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS) ++lib_libcyrus_la_LIBADD = libcrc32.la ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS) $(LIBM) + lib_libcyrus_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY) + + if USE_ZEROSKIP |