summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail-mta/courier/ChangeLog6
-rw-r--r--mail-mta/courier/Manifest6
-rw-r--r--mail-mta/courier/courier-0.45.3.ebuild366
-rw-r--r--mail-mta/courier/courier-0.45.5.ebuild2
-rw-r--r--mail-mta/courier/files/digest-courier-0.45.31
5 files changed, 8 insertions, 373 deletions
diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index ebbfc58ca895..82d5cd898b9b 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-mail/courier
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.6 2004/06/21 00:09:43 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.7 2004/06/22 22:23:31 swtaylor Exp $
+
+ 22 Jun 2004; Scott W Taylor <swtaylor@gentoo.org> -courier-0.45.3.ebuild,
+ courier-0.45.5.ebuild:
+ mark 0.45.5 stable
20 Jun 2004; Scott W Taylor <swtaylor@gentoo.org>
courier-0.45.6.20040618.ebuild, courier-0.45.6.ebuild:
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 6fb1cc27d505..9de04c9d9833 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,8 +1,7 @@
-MD5 f9307d3487b1391922388a62f339e770 ChangeLog 11249
+MD5 a091030f2e251fbaf77121b34450b921 ChangeLog 11372
MD5 3bf66fb95fa3291002dd8f877510b050 courier-0.45.6.20040618.ebuild 9862
-MD5 7af6ae5b6f825d951f53c2e4a7e90e1b courier-0.45.3.ebuild 10593
MD5 7af6ae5b6f825d951f53c2e4a7e90e1b courier-0.45.4.ebuild 10593
-MD5 998a12be29dc157df2b572c32afd5464 courier-0.45.5.ebuild 10694
+MD5 bc7e484110c317c7a49282ce36cc3e3a courier-0.45.5.ebuild 10690
MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
MD5 2440ceb0d5b910abf297c039a6f17214 courier-0.45.5.20040606.ebuild 10350
MD5 110d068d30306b13b5e5bd3db4482cd5 courier-0.45.6.ebuild 9862
@@ -10,7 +9,6 @@ MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
MD5 8041db031156342e93407a73a0ae75f5 files/courier-init 5206
MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
-MD5 b33ce95a6a289678698a31aaf6d156d5 files/digest-courier-0.45.3 68
MD5 e768202935622734d9020fe5d85ce079 files/digest-courier-0.45.4 68
MD5 07b2658af088270c5cf410ea205a41cd files/digest-courier-0.45.5 68
MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
diff --git a/mail-mta/courier/courier-0.45.3.ebuild b/mail-mta/courier/courier-0.45.3.ebuild
deleted file mode 100644
index 022c4a90aaba..000000000000
--- a/mail-mta/courier/courier-0.45.3.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
-
-inherit eutils
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-#SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 alpha ppc sparc"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite"
-
-PROVIDE="virtual/mta
- virtual/mda
- virtual/imapd"
-
-DEPEND="virtual/glibc
- >=dev-libs/openssl-0.9.6
- >=sys-libs/gdbm-1.8.0
- >=dev-tcltk/expect-5.33.0
- crypt? ( >=app-crypt/gnupg-1.0.4 )
- fax? ( >=media-libs/netpbm-9.12
- virtual/ghostscript
- >=net-dialup/mgetty-1.1.28 )
- pam? ( >=sys-libs/pam-0.75 )
- mysql? ( >=dev-db/mysql-3.23.36 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- postgres? ( >=dev-db/postgresql-7.1.3 )
- spell? ( virtual/aspell-dict )
- !virtual/mta
- !virtual/mda
- !virtual/imapd"
-
-RDEPEND="${DEPEND}
- app-admin/fam
- dev-lang/perl
- sys-apps/procps"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- sed -i -e 's:\#define.*USER_DIR.*\"Maildir\":\#define\tUSER_DIR\t\".maildir\":' \
- webmail/sqwebmail.h || die "failed to change maildir"
- sed -i -e 's:maildir="Maildir";:maildir=".maildir";:' \
- webmail/auth.c || die "failed to change maildir"
- use norewrite && epatch ${FILESDIR}/norewrite.patch
-}
-
-src_compile() {
- local myconf
- use pam || myconf="${myconf} --without-authpam"
- use ldap || myconf="${myconf} --without-authldap"
- use mysql || myconf="${myconf} --without-authmysql"
- use postgres || myconf="${myconf} --without-authpostgresql"
- use ipv6 || myconf="${myconf} --without-ipv6"
- use spell \
- && myconf="${myconf} --with-ispell" \
- || myconf="${myconf} --without-ispell"
-
- if [ -f /var/vpopmail/etc/lib_deps ]; then
- myconf="${myconf} --with-authvchkpw"
- else
- myconf="${myconf} --without-authvchkpw"
- fi
-
- #
- # 1. If nls is enabled and ENABLE_UNICODE is not empty...
- # enable the specified unicode sets
- # 2. If nls is enabled and no unicode sets are specified,
- # enable them all
- # 3. If nls is disabled, disable unicode sets
- #
- if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
- myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
- elif use nls; then
- myconf="${myconf} --enable-unicode"
- else
- myconf="${myconf} --disable-unicode"
- fi
-
- myconf="${myconf} debug=true"
-
- ./configure \
- --prefix=/usr \
- --disable-root-check \
- --mandir=/usr/share/man \
- --sysconfdir=/etc/courier \
- --libexecdir=/usr/lib/courier \
- --datadir=/usr/share/courier \
- --sharedstatedir=/var/lib/courier/com \
- --localstatedir=/var/lib/courier \
- --with-piddir=/var/run/courier \
- --with-authdaemonvar=/var/lib/courier/authdaemon \
- --with-mailuser=mail \
- --with-mailgroup=mail \
- --with-paranoid-smtpext \
- --disable-autorenamesent \
- --with-db=gdbm \
- --enable-mimetypes=/etc/apache/conf/mime.types \
- --enable-workarounds-for-imap-client-bugs \
- --host=${CHOST} ${myconf} || die "bad ./configure"
-
- emake || die "Compile problem"
-}
-
-chg_cfg() {
- file=${1}
- key=${2}
- value=${3}
-
- echo "changing ${file}: ${key} to ${value}"
- sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
- rm -f ${f}.tmp 1>/dev/null 2>&1
-}
-
-set_mime() {
- local files=$*
-
- chk_badmime='##NAME: BOFHBADMIME:0'
- pos_badmime='##NAME: NOADDMSGID:0'
- ins_badmime='\
-##NAME: BOFHBADMIME:0\
-#\
-# set BOFHBADMIME\
-# to \"reject\" to return mail with invalid MIME header\
-# to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
-# to \"accept\" to pass mail with invalid MIME header untouched\
-\
-BOFHBADMIME=accept\
-'
-
- local f
- for f in ${files}
- do
- if ! grep -q "${chk_badmime}" ${f}
- then
- echo "adding parameter ${chk_badmime} to ${f}"
- sed -e"/${pos_badmime}/ i ${ins_badmime}" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
- rm -f ${f}.tmp 1>/dev/null 2>&1
- fi
- done
-}
-
-set_maildir() {
- local files=$*
-
- origmaildir='Maildir'
- newmaildir='.maildir'
-
- local f
- for f in ${files}
- do
- echo "changing ${origmaildir} in ${f} to ${newmaildir}"
- sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
- rm -f ${f}.tmp 1> /dev/null 2>&1
- done
-}
-
-src_install() {
- dodir /var/lib/courier
- dodir /etc/pam.d
- make install DESTDIR=${D} || die
- # fix bug #15873 bad owner on /var/run/courier
- mkdir -p ${D}/var/run/courier
- diropts -o mail -g mail
- for dir2keep in `(cd ${D} && find . -type d)` ; do
- keepdir $dir2keep || die "failed running keepdir: $dir2keep"
- done
-
- local f
- cd ${D}/etc/courier
- mv imapd.authpam imap.authpam
- mv pop3d.authpam pop3.authpam
- for f in *.authpam
- do
- cp "${f}" "${D}/etc/pam.d/${f%%.authpam}"
- done
-
- exeinto /etc/init.d
- # we install the new single init script as courier
- newexe ${FILESDIR}/courier-init courier
- # and install the old main init script as courier-old if the old one
- # is installed which it will be now, but for the future...
- `grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
- newexe ${FILESDIR}/courier courier-old
- # the rest of them don't need to be installed
-
- einfo "Setting up maildirs by default in the account skeleton ..."
- diropts -m 755 -o root -g root
- keepdir /etc/skel
- ${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
- # we're going to try this out for a while -20031107
- #newins ${FILESDIR}/dot_courier .courier
- #fperms 644 /etc/skel/.courier
- keepdir /var/spool/mail
- ${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
- insinto /etc/courier
- newins ${FILESDIR}/bofh bofh
- newins ${FILESDIR}/locallowercase locallowercase
- newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
- echo 0 > ${D}/etc/courier/sizelimit
-
- cd ${S}
- dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
- dodoc authlib/README.authmysql.myownquery authlib/README.ldap courier/doc/*.txt
- echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
- >>${D}/usr/share/doc/${P}/README.htmldocs
-
- # See bug #10574
- # file which describes the webadmin password file
- insinto /etc/courier/webadmin
- insopts -m 400 -o mail -g mail
- doins ${FILESDIR}/password.dist
-
- # fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
- dosym /usr/bin/sendmail /usr/sbin/sendmail
-
- echo "MAILDIR=\$HOME/.maildir" >> ${D}/etc/courier/courierd
-
- # we change the names of the binaries, but webadmin is still looking
- # for the old names
- sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
- -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
- ${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
- || ewarn "failed to fix webadmin"
- sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
- -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
- ${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
- || ewarn "failed to fix webadmin"
-
- # avoid name collisions in /usr/sbin
- local y
- cd ${D}/usr/share/courier
- set_maildir imapd imapd-ssl pop3d pop3d-ssl
-
- cd ${D}/usr/sbin
- for y in imapd imapd-ssl pop3d pop3d-ssl
- do
- mv ${y} courier-${y}
- done
-
- cd ${D}/etc/courier
- for y in *.dist
- do
- cp ${y} ${y%%.dist}
- done
- touch esmtproutes
- touch backuprelay
- touch maildroprc
- [ -e ldapaliasrc ] && chown mail:root ldapaliasrc
- chg_cfg imapd-ssl COURIERTLS /usr/bin/couriertls
- chg_cfg authdaemonrc authmodulelist authpam
- chg_cfg authdaemonrc version authdaemond.plain
- set_mime esmtpd esmtpd-ssl esmtpd-msa
- set_maildir courierd imapd pop3d
-}
-
-pkg_postinst() {
- cd ${S}
- make install-configure
-
- # fixes bug #15873 for upgrades, should be able to yank this sometime in
- # the future
- chown --recursive mail:mail ${ROOT}/var/run/courier
-
- # need to do this for new installs to be able to start courier
- # without having to run rc-update ...
- # NOTE: not needed with new portages, but I'll leave it for a while for
- # old portages
- /etc/init.d/depscan.sh
-
- einfo "The following command will setup courier for your system:"
- einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
- echo
- einfo "To enable webmail/webadmin, run the following commands:"
- einfo "$ echo \"Include /etc/courier/apache-sqwebmail.inc\" >> /etc/apache*/conf/apache.conf"
- einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
- einfo "Then visit: http(s)://localhost/courier/webmail"
- echo
- einfo "imap behavior has changed, you may need to have your imap clients logoff"
- einfo "and back on again"
- echo
- echo
- ewarn "The init scripts for courier have changed."
- ewarn "There is now one init script (/etc/init.d/courier). The rest"
- ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
- ewarn "need to edit the following files in /etc/courier to enable"
- ewarn "the different services:"
- ewarn "imapd"
- ewarn "imapd-ssl"
- ewarn "pop3d"
- ewarn "pop3d-ssl"
- ewarn "esmtpd"
- ewarn "esmtpd-msa"
- ewarn "esmtpd-ssl"
- ewarn "hint: look for a line at the bottom of the file that looks like so"
- ewarn "ESMTPDSTART=NO"
- ewarn "and change it to YES for the services that you use"
- echo -ne "\a" ; sleep 1
- echo -ne "\a" ; sleep 1
- echo -ne "\a" ; sleep 1
- echo -ne "\a" ; sleep 1
- echo -ne "\a" ; sleep 1
-}
-
-pkg_config() {
- mailhost=`hostname`
- export mailhost
-
- domainname=`domainname`
- if [ "x$domainname" = "x(none)" ] ; then
- domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
- fi
- export domainname
-
-
- if [ ${ROOT} = "/" ] ; then
- file=${ROOT}/etc/courier/locals
- if [ ! -f ${file} ] ; then
- echo "localhost" > ${file};
- echo ${domainname} >> ${file};
- fi
- file=${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}
- if [ ! -f ${file} ] ; then
- echo ${domainname} > ${file}
- /usr/sbin/makeacceptmailfor
- fi
-
- file=${ROOT}/etc/courier/smtpaccess/${domainname}
- if [ ! -f ${file} ]
- then
- netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
- do
- i=1
- net=""
- TIFS=${IFS}
- IFS="."
- for o in ${netmask}
- do
- if [ ${o} == "255" ]
- then
- [ "_${net}" == "_" ] || net="${net}."
- t=`echo ${network} | cut -d " " -f ${i}`
- net="${net}${t}"
- fi
- i=$((${i} + 1))
- done
- IFS=${TIFS}
- echo "doing configuration - relay control for the network ${net} !"
- echo "${net} allow,RELAYCLIENT" >> ${file}
- done
- /usr/sbin/makesmtpaccess
- fi
- fi
-
- echo "creating cert for esmtpd-ssl:"
- /usr/sbin/mkesmtpdcert
- echo "creating cert for imapd-ssl:"
- /usr/sbin/mkpop3dcert
- echo "creating cert for pop3d-ssl:"
- /usr/sbin/mkimapdcert
-}
diff --git a/mail-mta/courier/courier-0.45.5.ebuild b/mail-mta/courier/courier-0.45.5.ebuild
index ac89cba25a20..aeac187382f1 100644
--- a/mail-mta/courier/courier-0.45.5.ebuild
+++ b/mail-mta/courier/courier-0.45.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.courier-mta.org/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc sparc"
IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite"
PROVIDE="virtual/mta
diff --git a/mail-mta/courier/files/digest-courier-0.45.3 b/mail-mta/courier/files/digest-courier-0.45.3
deleted file mode 100644
index b9523cf55b64..000000000000
--- a/mail-mta/courier/files/digest-courier-0.45.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1f657b5b0fd8d41d2eb2372fdfe1b41 courier-0.45.3.tar.bz2 4317585