From 30c2cb2c8971dc95b672303f9191d166d622fe47 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Nov 2022 03:19:10 +0000 Subject: gentoo auto-resync : 06:11:2022 - 03:19:10 --- net-mail/Manifest.gz | Bin 14559 -> 14566 bytes net-mail/courier-imap/Manifest | 3 + net-mail/courier-imap/courier-imap-5.1.8.ebuild | 251 +++++++++++++++++++++ .../files/courier-imap-5.1.8-aclocal-fix.patch | 12 + 4 files changed, 266 insertions(+) create mode 100644 net-mail/courier-imap/courier-imap-5.1.8.ebuild create mode 100644 net-mail/courier-imap/files/courier-imap-5.1.8-aclocal-fix.patch (limited to 'net-mail') diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz index 4fd26820fefa..8ea356a24eb8 100644 Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index b0cc00197b82..6dde08a27a89 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -13,6 +13,7 @@ AUX courier-imap-4.17-aclocal-fix.patch 299 BLAKE2B 605f76516a72269720d07e1e8fc8 AUX courier-imap-4.17-db4-bdbobj_configure.ac.patch 1499 BLAKE2B d619e493b066e0d60d083339ea2c7d09902a6aaa7a49996d47f895cf4e72ff5adc6a06e79c0173c548db10c66c31cae7b9aa69d5516c5acb487517ece328ed0a SHA512 2d1db6d13194b5e0866fadab40453264a07df8bf26b241af9f130b79dd800a4bb888a28151c7833b375315f43c9c42946312bc36220232a372179b23e5107b30 AUX courier-imap-4.17-db4-configure.ac.patch 1464 BLAKE2B 7f3aa5c86c7d12d369844757dbb3038afe9d12a034ec5d63860df76dba86ce18724fefc2c12f5596a27620ae05849ec9595ba1e410cadb0853dc4c322f965dd9 SHA512 55433b330d1039cd177af058cbc4a2bf7a65e53b8ecf29955c499dd6a68d634d7582449f54d1c70675ed759586e4d9dc7f43ce3703113e76df81b2a8703085bd AUX courier-imap-5.0.8-ar-fix.patch 263 BLAKE2B d21499a4bda24e7434cc41a29a9eadfeab41e52fd4b6a2d58569789aa76f8c73578d1a3c412021cfcbf56d8e33138c545d6d921e1030120dee8309e37679ec14 SHA512 a25d0e40a43a3539c7f5bb0e694a410fbdb3a5538ee8c5c82bd0c361023f4d5d8f40002fe2b79f517366cbe004d42238d6190642d003660ffd132142a959c840 +AUX courier-imap-5.1.8-aclocal-fix.patch 306 BLAKE2B 4fc75b3a14002976bd6a27a57ee40afa12cf3899c7aaac916ea42939b78fa1018919b6ce5f3f80c4a97b7d7dbf50e533c68a23279b476c6158c6bc1581d4882b SHA512 1e49d00d5040f5b735a965eb84cc35948c0dbe918cfb56b0c43e0a32848373afd8ca7fbb6f3fa4ffcf77b74b3c0c83ba3e3931ab1c6d5ea748a759874ab0f2f0 AUX courier-imap-gentoo.readme 2827 BLAKE2B fc45b7180165b5ed69a1722c268d5a6f742a16effe3f883b7ed268ee8b76527675d7b792712bfdb2b68d5bfe49fbc9d2e6af61ba2bd5b3dbed28f9be6ba397b8 SHA512 a677218ed39483dbe07358382f557a877486d5028b890ce25822663a6fff58a4744d245537a5395c7a403a566522753c91f9c0c511b9a7229ac1ea2ba4a9c54c AUX courier-imap.cron 32 BLAKE2B ccdf922262a94899370df48f49654e57c77758abb7843e112bf3232752ae25e9fc19337a425bd30914e1207a5bdcc1ca258ab8780a3516790c31eaff51a77039 SHA512 a4d3c648e83d3e067321cb28e613eddd1f689532e67811ae612089c43b1d8b163459d138fdd695cc11a0aef399028c880f7a97b33745e1fcd84ffd9b61e6ee93 AUX courier-imapd-r1.service 299 BLAKE2B 7b1fb3acc3b75cac873967f1eca099e9f65951feecb2fe6cded69ac437f47387bca493071012c1f98b579c184cdbbf0f1e464eed44d441a308f370fe112f4365 SHA512 5b44983d067b447bc60bd5365340c7ffd0c7102eba93fd87dda6cafb95c8625efe5badfaa4607c13a21ce37a7e781f5b81a47b9b18666403263e3d8789310d44 @@ -23,8 +24,10 @@ DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7 DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c DIST courier-imap-5.1.7.tar.bz2 3364221 BLAKE2B 8a34595879b6ab249db8d90d0a7845b63503c7e9f1ff449e90311fdc086b6a1486fa9ed748d4eba7541265b958ea58514bafd6c90c88cc21f579705e33e5fe55 SHA512 15f64ea78f34d4a3af9f82a8247907324b26a8c550f5e97930548449fc2e9b649d2b5511de063cf3e449843516e681232a3197f2afb40e18be0f36fd8e05e66d +DIST courier-imap-5.1.8.tar.bz2 3395074 BLAKE2B 1d563d49d61f3ab89297afdc9dd2947280ea5d2d21e0b1e91ec4fa1f54b9385ee41d32b7488236f3492fa41349d7f35c1dc84ee30e07a1752db424391f871db0 SHA512 c939c82e81f8ae98dc52279ee8fffabfee78db7792fdd3bd14ad0e60f7c5bd2c581cffcc3b7f6e2271f250556e9e80713cfcd1834653d59698d51d91435d28f3 EBUILD courier-imap-5.1.2-r1.ebuild 7055 BLAKE2B 490ff0c972159bee1718f0a8f3c51fb0a2789b2f488f9344045950c3d20f908164947c68bada94196972c2cd8b7eb3f9a24a91630646e803fb53d359aeebff1d SHA512 86e7d1a28d6a37dc22471b9c965188f61b4b99ab8e1981f27c4cedb02ce3dbbbb4d8a4d3cfb1ce961a2f9cdc4b4e4c9195bc27651651e889c81f3a93b44f3c0d EBUILD courier-imap-5.1.3-r1.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf EBUILD courier-imap-5.1.4.ebuild 7056 BLAKE2B 56a06f662daa0b4e45c0ed755c536a2f29f5168cfc84fe62db809de2865cbb4c3e74c2104034d9dce707d9e405c09f4c8523cbd163f7a96adf9669c27446ec3e SHA512 381c68368c66c33f7a0f709ac0b3ab430e5b10b57c0bc12ac6943969c7bb3dca1780bc423437316203fc9ac0d7ab50ae7906ac50cba0fa9302a4d17704c2eb7f EBUILD courier-imap-5.1.7.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf +EBUILD courier-imap-5.1.8.ebuild 7063 BLAKE2B d25a2ec4dc61ab0316c30f3c7b14d33f8acb517922eef5360e701f3ab1222e4426fa8aa92f89e811dbaa4466f900ea5781e14aed51777ca2d9b776cfc90c2ec9 SHA512 41a68fb41c9e5efe04975cbc598f155c6ad70d001efd1c80a8d55ea20a095a967eb6dde921d5ac532f6ad813eaf1c965b9aa40107d8f9688ec4c8d7bee9b7619 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950 diff --git a/net-mail/courier-imap/courier-imap-5.1.8.ebuild b/net-mail/courier-imap/courier-imap-5.1.8.ebuild new file mode 100644 index 000000000000..46c3b04b3b1a --- /dev/null +++ b/net-mail/courier-imap/courier-imap-5.1.8.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools readme.gentoo-r1 systemd + +DESCRIPTION="An IMAP daemon designed specifically for maildirs" +HOMEPAGE="https://www.courier-mta.org/imap/" +SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" +REQUIRED_USE="|| ( berkdb gdbm )" + +CDEPEND=" + gnutls? ( net-libs/gnutls:=[tools] ) + !gnutls? ( + dev-libs/openssl:0= + ) + >=net-libs/courier-authlib-0.71 + >=net-libs/courier-unicode-2:= + >=net-mail/mailbase-0.00-r8 + net-dns/libidn:= + berkdb? ( sys-libs/db:= ) + fam? ( virtual/fam ) + gdbm? ( >=sys-libs/gdbm-1.8.0:= ) +" +DEPEND="${CDEPEND} + dev-lang/perl + !mail-mta/courier + sys-process/procps +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-courier ) +" + +# get rid of old style virtual - bug 350792 +RDEPEND="${RDEPEND} + !mail-mta/courier + !net-mail/cyrus-imapd +" + +RC_VER="4.0.6-r1" +INITD_VER="4.0.6-r1" + +# make check is not supported by this package due to the +# --enable-workarounds-for-imap-client-bugs option. +RESTRICT="test" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading +and remove TLS_DHPARAMS from configuration files or run mkdhparams + +For a quick-start howto please refer to +${PN}-gentoo.readme in /usr/share/doc/${PF} + +Please convert maildir to utf8 +and rerun mkdhparams if needed. Location has changed +" + +PATCHES=( + "${FILESDIR}/${PN}-5.1.8-aclocal-fix.patch" + "${FILESDIR}/${PN}-5.0.8-ar-fix.patch" +) + +src_prepare() { + default + + # These patches should fix problems detecting BerkeleyDB. + # We now can compile with db4 support. + if use berkdb ; then + eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch" + eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch" + fi + + eautoreconf +} + +src_configure() { + local myconf="" + + # Default to gdbm if both berkdb and gdbm are present. + if use gdbm ; then + einfo "Building with GDBM support" + myconf="${myconf} --with-db=gdbm" + elif use berkdb ; then + einfo "Building with BerkeleyDB support" + myconf="${myconf} --with-db=db" + fi + + if use trashquota ; then + einfo "Building with Trash Quota Support" + myconf="${myconf} --with-trashquota" + fi + + use debug && myconf="${myconf} debug=true" + + econf \ + --with-notice=unicode \ + --disable-root-check \ + --bindir=/usr/sbin \ + --sysconfdir="/etc/${PN}" \ + --libexecdir="/usr/$(get_libdir)/${PN}" \ + --localstatedir="/var/lib/${PN}" \ + --with-authdaemonvar="/var/lib/${PN}/authdaemon" \ + --enable-workarounds-for-imap-client-bugs \ + --with-mailuser=mail \ + --with-mailgroup=mail \ + --with-certsdir="/etc/courier-imap" \ + $(use_with fam) \ + $(use_with ipv6) \ + $(use_with gnutls) \ + ${myconf} +} + +#src_compile() { + # spurious failures with parallel compiles, bug #???? +# emake -j1 +#} + +src_install() { + dodir "/var/lib/${PN}" /etc/pam.d + keepdir /var/lib/courier-imap + + default + rm -r "${D}/etc/pam.d" || die + + # Avoid name collisions in /usr/sbin wrt imapd and pop3d + for name in imapd pop3d ; do + mv "${D}/usr/sbin/"{,courier-}${name} \ + || die "failed to rename ${name} to courier-${name}" + done + + # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of + # 'Maildir', and to use /usr/sbin/courier-foo names. + for service in {imapd,pop3d}{,-ssl} ; do + sed -e 's/Maildir/${MAILDIR}/' \ + -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ + || die "sed failed" + sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \ + -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ + || die "sed failed" + done + + # Rename the config files correctly and add a value for ${MAILDIR} + # to them. + for service in {imapd,pop3d}{,-ssl} ; do + mv "${D}/etc/${PN}/${service}"{.dist,} \ + || die "failed to rename ${service}.dist to ${service}" + echo -e '\n# Hardwire a value for ${MAILDIR}' \ + >> "${D}/etc/${PN}/${service}" + echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}" + echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}" + done + + for service in imapd pop3d ; do + echo -e '# Put any program for ${PRERUN} here' \ + >> "${D}/etc/${PN}/${service}" + echo 'PRERUN=' >> "${D}/etc/${PN}/${service}" + echo -e '# Put any program for ${LOGINRUN} here' \ + >> "${D}/etc/${PN}/${service}" + echo -e '# this is for relay-ctrl-allow in 4*' \ + >> "${D}/etc/${PN}/${service}" + echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}" + done + + for x in "${D}/usr/sbin"/* ; do + if [[ -L "${x}" ]] ; then + rm "${x}" || die "failed to remove ${x}" + fi + done + + mv "${D}/usr/share"/* "${D}/usr/sbin/" || die + mv "${D}/usr/sbin/man" "${D}/usr/share/" || die + + rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die + + dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" + + dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger" + + for initd in courier-{imapd,pop3d}{,-ssl} ; do + sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ + "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \ + > "${T}/${initd}" \ + || die "initd libdir-sed failed" + doinitd "${T}/${initd}" + done + + cp "${FILESDIR}"/courier-*-r1.service . + + sed -i \ + -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ + courier-*-r1.service \ + || die + + systemd_newunit courier-authdaemond-r1.service \ + courier-authdaemond.service + systemd_newunit courier-imapd-ssl-r1.service \ + courier-imapd-ssl.service + systemd_newunit courier-imapd-r1.service \ + courier-imapd.service + + exeinto "/usr/$(get_libdir)/${PN}" + for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do + sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ + "${FILESDIR}/${PN}-${RC_VER}-${exe}" \ + > "${T}/${exe}" \ + || die "exe libdir-sed failed" + doexe "${T}/${exe}" + done + + # Avoid a collision with mail-mta/netqmail, bug 482098. + mv "${D}/usr/sbin/"{,courier-}maildirmake \ + || die "failed to rename maildirmake to courier-maildirmake" + mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \ + || die "failed to rename maildirmake.1 to courier-maildirmake.1" + + dodoc AUTHORS INSTALL NEWS README ChangeLog + readme.gentoo_create_doc + dodoc "${FILESDIR}/${PN}-gentoo.readme" + docinto imap + dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README* + docinto maildir + dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README* + docinto rfc2045 + dodoc libs/rfc2045/*.html + docinto tcpd + dodoc libs/tcpd/README* libs/tcpd/*.html + exeinto /etc/cron.monthly + newexe "${FILESDIR}"/${PN}.cron ${PN} +} + +pkg_postinst() { + # Some users have been reporting that permissions on this directory were + # getting scrambled, so let's ensure that they are sane. + fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}" + + readme.gentoo_print_elog + + elog "" + elog "Courier Imap now run as user mail:mail." + elog "" + elog "This require you to enable read/write access to the caches:" + elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" + elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" +} diff --git a/net-mail/courier-imap/files/courier-imap-5.1.8-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-5.1.8-aclocal-fix.patch new file mode 100644 index 000000000000..0ab4ca0f5403 --- /dev/null +++ b/net-mail/courier-imap/files/courier-imap-5.1.8-aclocal-fix.patch @@ -0,0 +1,12 @@ +Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206). + +--- a/configure.ac 2022-11-05 19:37:21.629552607 +0100 ++++ b/configure.ac 2022-11-05 19:37:31.622405720 +0100 +@@ -14,7 +14,6 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET +-AC_PROG_SYSCONFTOOL + LT_INIT + + AC_PATH_PROGS(PERL, perl5 perl, perl) -- cgit v1.2.3