commit: e365f1253f5401e64199b04d8c7466ffd5bc887d Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Oct 26 18:55:50 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 18:56:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e365f125
net-mail/courier-imap: drop 5.1.2-r2 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> net-mail/courier-imap/Manifest | 1 - net-mail/courier-imap/courier-imap-5.1.2-r2.ebuild | 251 --------------------- .../files/courier-imap-4.17-aclocal-fix.patch | 12 - ...courier-imap-4.17-db4-bdbobj_configure.ac.patch | 33 --- .../files/courier-imap-4.17-db4-configure.ac.patch | 33 --- 5 files changed, 330 deletions(-) diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index 38b9c3c4df67..12430b9f2577 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -1,3 +1,2 @@ -DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d DIST courier-imap-5.2.10.tar.bz2 3415819 BLAKE2B 61728277e1c30e8487ab99370df8800954071a54e00bc1b73f5633060c14378633e94ea43334fcd4f6763a1adef26a4d19cc96db32ca3d089a8fd85b0a9e899b SHA512 4dd899127e37fc99dc7cacec824e0f922ce0e0c3cff0aaccc818ea6a903a991517b6d98a2c350125f3cad57fe0dc79dc13704fce3874d869158ea7a868cae180 DIST courier-imap-5.2.11.tar.bz2 3418726 BLAKE2B 3acd70848f7946c2ab4b4078d2d20fea2033c13270a4701fa6d2bf54c26a3c6552e6b5877ab095db38e49a6f5c1aa9c2b61bf948d6540a724b4466b979830ea1 SHA512 8588088a55346bb3db6823b5a4680b3fe54dc05d055e7040f36f355b2c77537a97be1d392ad12006a132b0c5960f04a07b9c19f4cd74f4be989210215978e608 diff --git a/net-mail/courier-imap/courier-imap-5.1.2-r2.ebuild b/net-mail/courier-imap/courier-imap-5.1.2-r2.ebuild deleted file mode 100644 index 1e578512989e..000000000000 --- a/net-mail/courier-imap/courier-imap-5.1.2-r2.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2025 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="https://downloads.sourceforge.net/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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.4:= - >=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}-4.17-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. - chmod 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-4.17-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.17-aclocal-fix.patch deleted file mode 100644 index 9f88646b223a..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.17-aclocal-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206). - ---- a/configure.ac.orig 2006-12-30 09:28:52.000000000 -0500 -+++ b/configure.ac 2007-02-27 12:13:38.000000000 -0500 -@@ -15,7 +15,6 @@ - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET --AC_PROG_SYSCONFTOOL - AC_LIBTOOL_DLOPEN - AM_PROG_LIBTOOL - diff --git a/net-mail/courier-imap/files/courier-imap-4.17-db4-bdbobj_configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.17-db4-bdbobj_configure.ac.patch deleted file mode 100644 index 1f9b7747a7f8..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.17-db4-bdbobj_configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/libs/bdbobj/configure.ac.orig 2013-08-25 20:52:10.000000000 +0200 -+++ b/libs/bdbobj/configure.ac 2013-11-22 10:39:25.787861774 +0100 -@@ -23,15 +23,22 @@ - dnl Checks for libraries. - - saveLIBS="$LIBS" --AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ], -- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], -- AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"]) -- )) -- -+for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db -+ do -+ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ])))))) -+ done - FOUND_DB=0 --AC_CHECK_FUNC(dbopen, FOUND_DB=1) --AC_CHECK_FUNC(db_open, FOUND_DB=1) --AC_CHECK_FUNC(db_env_create, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4004, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4003, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1) -+AC_CHECK_FUNC(db_create, FOUND_DB=1) - - LIBS="$saveLIBS" - diff --git a/net-mail/courier-imap/files/courier-imap-4.17-db4-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.17-db4-configure.ac.patch deleted file mode 100644 index e89c5618f842..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.17-db4-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure.ac.orig 2013-09-28 19:44:24.000000000 +0200 -+++ b/configure.ac 2013-11-22 10:46:34.910990069 +0100 -@@ -180,15 +180,21 @@ - if test "$db" != "gdbm" - then - -- AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ], -- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], -- AC_CHECK_LIB(db, db_env_create, -- [ LIBDB=-ldb; LIBS="-ldb $LIBS"]) -- )) -- -- AC_CHECK_FUNC(dbopen, HAVE_BDB=1) -- AC_CHECK_FUNC(db_open, HAVE_BDB=1) -- AC_CHECK_FUNC(db_env_create, HAVE_BDB=1) -+for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db -+ do -+ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ])))))) -+ done -+AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create, HAVE_BDB=1) - fi - - LIBS="$saveLIBS"
