diff options
10 files changed, 11 insertions, 376 deletions
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog index 8d6836c9c26c..92401936695c 100644 --- a/net-mail/courier-imap/ChangeLog +++ b/net-mail/courier-imap/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-mail/courier-imap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.219 2014/08/10 20:43:48 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.220 2014/08/11 22:24:36 mrueg Exp $ + + 11 Aug 2014; Manuel Rüger <mrueg@gentoo.org> -courier-imap-4.8.0-r1.ebuild, + -files/courier-authdaemond.service, + -files/courier-imap-4.0.1-disable-fam-configure.in.patch, + -files/courier-imap-4.0.6-aclocal-fix.patch, + -files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch, + -files/courier-imap-4.0.6-db4-configure.in.patch, + -files/courier-imap-4.0.6-db4-tcpd_configure.in.patch, + -files/courier-imapd-ssl.service, -files/courier-imapd.service: + Cleanup old. 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> courier-imap-4.15-r1.ebuild, courier-imap-4.8.0-r1.ebuild: diff --git a/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild b/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild deleted file mode 100644 index 92e724ed6790..000000000000 --- a/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.8.0-r1.ebuild,v 1.12 2014/08/10 20:43:48 slyfox Exp $ - -EAPI=5 -inherit autotools eutils multilib libtool systemd - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="http://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -LICENSE="GPL-3" -SLOT="0" -IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota" -REQUIRED_USE="|| ( berkdb gdbm )" - -RDEPEND="gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/openssl-0.9.6 ) - >=net-libs/courier-authlib-0.61 - >=net-mail/mailbase-0.00-r8 - berkdb? ( sys-libs/db ) - fam? ( virtual/fam ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - selinux? ( sec-policy/selinux-courier )" -DEPEND="${RDEPEND} - dev-lang/perl - !mail-mta/courier - userland_GNU? ( sys-process/procps )" - -# get rid of old style virtual - bug 350792 -# all blockers really needed? -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd - !net-mail/uw-imap" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -src_prepare() { - # Bug #48838. Patch to enable/disable FAM support. - # 20 Aug 2004 langthang@gentoo.org - # This patch should fix bug #51540. fam USE flag is not needed for shared folder support. - epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch - - # Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206). - epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch - - # These patches should fix problems detecting BerkeleyDB. - # We now can compile with db4 support. - if use berkdb ; then - epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch - epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch - fi - - eautoreconf -} - -src_configure() { - local myconf="" - - # 19 Aug 2004 langthang@gentoo.org - # 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 - - # Disabling unicode is no longer supported - # By default all available character sets are included - # Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10 - # to include only specified translation tables. - if [[ -z "${ENABLE_UNICODE}" ]] ; then - einfo "ENABLE_UNICODE is not set, building with all available character sets" - myconf="${myconf} --enable-unicode" - else - einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}" - myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}" - fi - - if use trashquota ; then - einfo "Building with Trash Quota Support" - myconf="${myconf} --with-trashquota" - fi - - use debug && myconf="${myconf} debug=true" - - # Do the actual build now - econf \ - --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 \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} || die "econf failed" - - # Change the pem file location. - sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \ - imap/imapd-ssl.dist || \ - die "sed failed" - - sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \ - imap/pop3d-ssl.dist || \ - die "sed failed" -} - -src_compile() { - # spurious failures with parallel compiles - emake -j1 -} - -src_install() { - dodir /var/lib/${PN} /etc/pam.d - emake DESTDIR="${D}" install - rm -Rf "${D}/etc/pam.d" - - # Avoid name collisions in /usr/sbin wrt imapd and pop3d - cd "${D}/usr/sbin" - for name in imapd pop3d ; do - mv -f "${name}" "courier-${name}" || die "Failed to mv ${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. - cd "${D}/usr/$(get_libdir)/${PN}" - for service in {imapd,pop3d}{,-ssl} ; do - sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed" - sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed" - done - - # Rename the config files correctly and add a value for ${MAILDIR} to them. - cd "${D}/etc/${PN}" - for service in {imapd,pop3d}{,-ssl} ; do - mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}" - echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}" - echo 'MAILDIR=.maildir' >> "${service}" - echo 'MAILDIRPATH=.maildir' >> "${service}" - done - for service in imapd pop3d ; do - echo -e '# Put any program for ${PRERUN} here' >> "${service}" - echo 'PRERUN=' >> "${service}" - echo -e '# Put any program for ${LOGINRUN} here' >> "${service}" - echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}" - echo 'LOGINRUN=' >> "${service}" - done - - cd "${D}/usr/sbin" - for x in * ; do - if [[ -L "${x}" ]] ; then - rm -f "${x}" || die "Failed to rm ${x}" - fi - done - - cd ../share - mv -f * ../sbin - mv -f ../sbin/man . - cd .. - - for x in mkimapdcert mkpop3dcert ; do - mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig" - done - - exeinto /usr/sbin - doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" - - dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger - - mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp" - - for initd in courier-{imapd,pop3d}{,-ssl} ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed" - doinitd "${initd}" - done - - systemd_dounit "${FILESDIR}"/courier-authdaemond.service - systemd_dounit "${FILESDIR}"/courier-imapd-ssl.service - systemd_dounit "${FILESDIR}"/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}" > "${exe}" || die "exe libdir-sed failed" - doexe "${exe}" - done - - dodir /usr/bin - mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake" - - # Bug #45953, more docs. - cd "${S}" - dohtml -r "${S}"/* - dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme - docinto imap - dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README} - docinto maildir - dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt} - docinto tcpd - dodoc "${S}"/tcpd/README.couriertls -} - -pkg_postinst() { - elog "Authdaemond is no longer provided by this package." - elog "Authentication libraries are now in courier-authlib." - elog "For a quick-start howto please refer to" - elog "${PN}-gentoo.readme in /usr/share/doc/${PF}" - # 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}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}" -} - -src_test() { - ewarn "make check is not supported by this package due to the" - ewarn "--enable-workarounds-for-imap-client-bugs option." -} diff --git a/net-mail/courier-imap/files/courier-authdaemond.service b/net-mail/courier-imap/files/courier-authdaemond.service deleted file mode 100644 index c4cbbf1c18c1..000000000000 --- a/net-mail/courier-imap/files/courier-authdaemond.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Courier Authentification Daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -start /usr/lib/courier/courier-authlib/authdaemond -ExecStop=/usr/sbin/courierlogger -pid=/var/run/authdaemon.pid -stop /usr/lib/courier/courier-authlib/authdaemond -PIDFile=/var/run/authdaemon.pid - -[Install] -WantedBy=courier-imap.service diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch deleted file mode 100644 index 7019d02a6af5..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.0.1-disable-fam-configure.in.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- courier-imap-3.0.7-orig/maildir/configure.in 2004-06-08 15:44:23.000000000 -0700 -+++ courier-imap-3.0.7/maildir/configure.in 2004-08-14 15:28:20.525714876 -0700 -@@ -60,6 +60,12 @@ - dnl Checks for library functions. - AC_CHECK_HEADER(fam.h, :, :) - AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) -+AC_ARG_WITH(fam, [ --with-fam Compile with FAM support], -+ fam="$withval", -+ fam="no") -+ -+if test "$fam" != "no" -+then - AC_CHECK_LIB(fam, FAMOpen, [ - LIBFAM=-lfam - AC_DEFINE_UNQUOTED(HAVE_FAM,1, -@@ -74,6 +80,7 @@ - AC_MSG_ERROR([[FAM development libraries not found.]]) ] - ) - ]) -+fi - - AC_SUBST(LIBFAM) - diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch deleted file mode 100644 index 14e9cda636ab..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-aclocal-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in.orig 2006-12-30 09:28:52.000000000 -0500 -+++ configure.in 2007-02-27 12:13:38.000000000 -0500 -@@ -16,7 +16,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.0.6-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch deleted file mode 100644 index 4f14d72db5a4..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-bdbobj_configure.in.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- bdbobj/configure.in.orig 2001-09-18 18:26:28.000000000 -0700 -+++ bdbobj/configure.in 2004-08-14 16:15:08.469316646 -0700 -@@ -21,15 +21,23 @@ - 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"]) -- )) -- --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) -+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(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.0.6-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch deleted file mode 100644 index 03d2c03912a8..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-configure.in.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.in.orig 2004-11-16 16:02:11.045791896 -0800 -+++ configure.in 2004-11-16 16:03:06.743324584 -0800 -@@ -150,16 +149,22 @@ - - if test "$db" != "gdbm" - then -+ 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) - -- 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) - fi - - LIBS="$saveLIBS" diff --git a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch deleted file mode 100644 index 6fdff769afa7..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.0.6-db4-tcpd_configure.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tcpd/configure.in.orig 2007-02-02 17:20:18.000000000 +0100 -+++ tcpd/configure.in 2007-02-02 17:20:58.000000000 +0100 -@@ -84,7 +84,7 @@ - USE_GDBM=0 - LIBGDBM="" - dblibrary=../bdbobj/libbdbobj.la -- LIBDB="-Wl,$LIBDB" -+ LIBDB="$LIBDB" - ;; - *) - COURIERTCPD="" diff --git a/net-mail/courier-imap/files/courier-imapd-ssl.service b/net-mail/courier-imap/files/courier-imapd-ssl.service deleted file mode 100644 index 395611399db3..000000000000 --- a/net-mail/courier-imap/files/courier-imapd-ssl.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Courier IMAP Daemon -After=network.target - -[Service] -Type=forking -EnvironmentFile=/etc/courier-imap/imapd-ssl -ExecStart=/usr/lib/courier-imap/gentoo-imapd-ssl.rc -ExecStop=/bin/kill $MAINPID -PIDFile=/var/run/imapd-ssl.pid - -[Install] -WantedBy=multi-user.target diff --git a/net-mail/courier-imap/files/courier-imapd.service b/net-mail/courier-imap/files/courier-imapd.service deleted file mode 100644 index e8780b63729b..000000000000 --- a/net-mail/courier-imap/files/courier-imapd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Courier IMAP Daemon -After=network.target - -[Service] -Type=forking -EnvironmentFile=/etc/courier-imap/imapd -ExecStart=/usr/lib/courier-imap/gentoo-imapd.rc -ExecStop=/bin/kill $MAINPID -PIDFile=/var/run/imapd.pid - -[Install] -WantedBy=multi-user.target |