summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Goodyear <g2boojum@gentoo.org>2002-03-14 17:37:01 +0000
committerGrant Goodyear <g2boojum@gentoo.org>2002-03-14 17:37:01 +0000
commit7537c7eed63c780eaa13571abe007e9a66667672 (patch)
tree61488a9c1c8a988be502c5828c384adc40af2240 /net-mail/courier-imap
parentmodified pcmcia-cs package mask to mask my new, not tested enough, (diff)
downloadgentoo-2-7537c7eed63c780eaa13571abe007e9a66667672.tar.gz
gentoo-2-7537c7eed63c780eaa13571abe007e9a66667672.tar.bz2
gentoo-2-7537c7eed63c780eaa13571abe007e9a66667672.zip
Minor bug fix for people using courier-imap's pop3d.
Diffstat (limited to 'net-mail/courier-imap')
-rw-r--r--net-mail/courier-imap/ChangeLog9
-rw-r--r--net-mail/courier-imap/courier-imap-1.4.1-r3.ebuild135
-rw-r--r--net-mail/courier-imap/files/digest-courier-imap-1.4.1-r4 (renamed from net-mail/courier-imap/files/digest-courier-imap-1.4.1-r3)0
3 files changed, 8 insertions, 136 deletions
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index f4acc2219606..0b0a7fa091bc 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-mail/courier-imap
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.2 2002/02/21 19:17:21 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.3 2002/03/14 17:37:01 g2boojum Exp $
+
+*courier-imap-1.4.1-r4 (14 Mar 2002)
+
+14 Mar 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+ Fixed bug where /etc/courier-imap/pop3d didn't have
+ MAILDIR=.maildir set.
*courier-imap-1.4.1-r2 (21 Feb 2002)
diff --git a/net-mail/courier-imap/courier-imap-1.4.1-r3.ebuild b/net-mail/courier-imap/courier-imap-1.4.1-r3.ebuild
deleted file mode 100644
index a6c69b5a7db7..000000000000
--- a/net-mail/courier-imap/courier-imap-1.4.1-r3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-1.4.1-r3.ebuild,v 1.1 2002/02/23 15:42:26 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-SRC_URI="http://ftp1.sourceforge.net/courier/${P}.tar.gz"
-HOMEPAGE="http://www.courier-mta.org/"
-
-PROVIDE="virtual/imapd"
-
-DEPEND="virtual/glibc sys-devel/perl sys-apps/procps
- >=sys-libs/pam-0.75
- >=dev-libs/openssl-0.9.6
- ldap? ( >=net-nds/openldap-1.2.11 )
- mysql? ( >=dev-db/mysql-3.23.36 )
- berkdb? ( >=sys-libs/db-3.2 )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="virtual/glibc
- >=dev-libs/openssl-0.9.6
- pam? ( >=sys-libs/pam-0.75 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- mysql? ( >=dev-db/mysql-3.23.36 )
- berkdb? ( >=sys-libs/db-3.2 )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-#This package is complete if you just need basic IMAP functionality. Here are some things that
-#still need fixing:
-#supervise support (of course)
-#creation of imapd-ssl, pop3-ssl, pop3 init.d scripts (I only converted the imapd.rc script)
-#tweaking of config files.
-#My RC script is configured to look for maildirs in ~/.maildir (my preference, and the official
-#Gentoo Linux standard location) instead of the more traditional and icky ~/Maildir.
-#We need to add an /etc/mail.conf.
-
-src_compile() {
- local myconf
- if [ -z "`use ldap`" ] ; then
- myconf="--without-authldap"
- fi
- if [ -z "`use mysql`" ] ; then
- myconf="$myconf --without-authmysql"
- fi
- if [ "`use berkdb`" ] ; then
- myconf="$myconf --with-db=db"
- else
- myconf="$myconf --with-db=gdbm"
- fi
- if [ -z "`use pam`" ] ; then
- myconf="$myconf --without-authpam"
- fi
- ./configure --sysconfdir=/etc/courier-imap --prefix=/usr \
- --bindir=/usr/sbin --libexecdir=/usr/lib/courier-imap \
- --localstatedir=/var/lib/courier-imap --mandir=/usr/share/man \
- --with-authdaemonvar=/var/lib/courier-imap/authdaemon \
- --disable-root-check $myconf || die
-
- cd ${S}/imap
- cp imapd-ssl.dist imapd-ssl.dist.old
- sed -e "s:TLS_CERTFILE=/usr/share/imapd.pem:TLS_CERTFILE=/etc/courier-imap/imapd.pem:g" imapd-ssl.dist.old > imapd-ssl.dist
-
- cd ${S}
- emake || die
-}
-
-src_install () {
- dodir /var/lib/courier-imap
- mkdir -p ${D}/etc/pam.d
- make install DESTDIR=${D}
- # avoid name collisions in /usr/sbin wrt imapd and pop3d
- cd ${D}/usr/sbin
- for name in imapd pop3d
- do
- mv ${name} "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/lib/courier-imap
- local service
- for service in imapd pop3d
- do
- local type
- for type in "" "-ssl"
- do
- local file
- file="${service}${type}.rc"
- cp ${file} ${file}.orig
- sed -e 's/Maildir/${MAILDIR}/' \
- -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
- ${file}.orig > ${file}
- done
- done
- cd ${D}/etc/courier-imap
- local x
- for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
- do
- mv ${x}.dist ${x}
- done
- # add a value for ${MAILDIR} to /etc/courier-imap/imapd
- for service in imapd pop3d
- do
- echo -e '\n#Hardwire a value for ${MAILDIR}' >> imapd
- echo 'MAILDIR=.maildir' >> imapd
- done
- cd ${D}/usr/sbin
- for x in *
- do
- if [ -L ${x} ]
- then
- rm ${x}
- fi
- done
- cd ../share
- mv * ../sbin
- mv ../sbin/man .
- cd ..
- cd ${D}/etc/pam.d
- for x in *
- do
- cp ${x} ${x}.orig
- sed -e 's#/lib/security/##g' ${x}.orig > ${x}
- rm ${x}.orig
- done
- exeinto /etc/init.d
- newexe ${FILESDIR}/courier-imap-rc6 courier-imap
- newexe ${FILESDIR}/courier-imap-ssl-rc6 courier-imap-ssl
- rm ${D}/usr/sbin/mkimapdcert
- exeinto /usr/sbin
- doexe ${FILESDIR}/mkimapdcert
- insinto /etc/pam.d
- doins ${FILEDIR}/pam.d-imap
-}
-
diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.4.1-r3 b/net-mail/courier-imap/files/digest-courier-imap-1.4.1-r4
index 84f00b79495e..84f00b79495e 100644
--- a/net-mail/courier-imap/files/digest-courier-imap-1.4.1-r3
+++ b/net-mail/courier-imap/files/digest-courier-imap-1.4.1-r4