From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1436186-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C6849158094
for <garchives@archives.gentoo.org>; Thu, 15 Sep 2022 00:09:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 158FFE099E;
Thu, 15 Sep 2022 00:09:52 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B060FE099E
for <gentoo-commits@lists.gentoo.org>; Thu, 15 Sep 2022 00:09:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9952D340ED6
for <gentoo-commits@lists.gentoo.org>; Thu, 15 Sep 2022 00:09:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 32C6C5D0
for <gentoo-commits@lists.gentoo.org>; Thu, 15 Sep 2022 00:09:49 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1663200580.15c7f1aa8f2e0ff391b19af7573679ae33689b78.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0001-Test-for-libm.patch net-mail/cyrus-imapd/files/cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch
X-VCS-Directories: net-mail/cyrus-imapd/ net-mail/cyrus-imapd/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 15c7f1aa8f2e0ff391b19af7573679ae33689b78
X-VCS-Branch: master
Date: Thu, 15 Sep 2022 00:09:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 53d86ea1-7c1f-4536-a11c-d214c89774a5
X-Archives-Hash: de76db1ce5b16fdd79f0c66372dae24a
commit: 15c7f1aa8f2e0ff391b19af7573679ae33689b78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 00:08:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 00:09:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c7f1aa
net-mail/cyrus-imapd: fix build w/ LLD
Closes: https://bugs.gentoo.org/721466
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild | 247 +++++++++++++++++++++
.../cyrus-imapd-3.4.4-0001-Test-for-libm.patch | 32 +++
...3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch | 23 ++
3 files changed, 302 insertions(+)
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