bump and cleanup
authorScott W Taylor <swtaylor@gentoo.org>
Wed, 1 Dec 2004 18:26:25 +0000 (18:26 +0000)
committerScott W Taylor <swtaylor@gentoo.org>
Wed, 1 Dec 2004 18:26:25 +0000 (18:26 +0000)
12 files changed:
mail-mta/courier/ChangeLog
mail-mta/courier/Manifest
mail-mta/courier/courier-0.45.6.ebuild [deleted file]
mail-mta/courier/courier-0.46.20040816.ebuild [deleted file]
mail-mta/courier/courier-0.47.20041113.ebuild [deleted file]
mail-mta/courier/courier-0.47.20041120.ebuild [deleted file]
mail-mta/courier/courier-0.47.20041129.ebuild
mail-mta/courier/courier-0.47.ebuild
mail-mta/courier/files/digest-courier-0.45.6 [deleted file]
mail-mta/courier/files/digest-courier-0.46.20040816 [deleted file]
mail-mta/courier/files/digest-courier-0.47.20041113 [deleted file]
mail-mta/courier/files/digest-courier-0.47.20041120 [deleted file]

index 55af3efbabd6dcb3f6fb474457856952743c997e..fcffd634e93fb5e68d0f43ff08a8f855ea189729 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.31 2004/12/01 11:21:27 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.32 2004/12/01 18:26:25 swtaylor Exp $
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org> -courier-0.45.6.ebuild,
+  -courier-0.46.20040816.ebuild, -courier-0.47.20041113.ebuild,
+  -courier-0.47.20041120.ebuild, courier-0.47.20041129.ebuild,
+  courier-0.47.ebuild:
+  bump and cleanup
 
 *courier-0.47.20041129 (01 Dec 2004)
 
index c0b18fd9d9963a20f484bb3c98916a85483c1fd9..30781dda44aa4dbd8516dc561fb34dc1f58d475c 100644 (file)
@@ -1,13 +1,9 @@
-MD5 f1c79af8c8d27a040aa7d3b2e300220f courier-0.47.20041113.ebuild 8501
-MD5 af7b91ede7e2795f877c23b908704d28 courier-0.47.ebuild 10449
-MD5 1ad860680316e806d9a546d0c8b6e19c courier-0.47.20041129.ebuild 8504
+MD5 eae06bc935727a2243daae27af6fba24 courier-0.47.ebuild 10447
+MD5 cebed656a4e8a699f8cf823c69ccfd53 courier-0.47.20041129.ebuild 8489
 MD5 9482696d470d858a2e9331aed21191fa courier-0.46.ebuild 9766
 MD5 8169e6bebff6d078a1c11fad92e6ffbe courier-0.46.20040825.ebuild 10008
-MD5 196c7b05683fb0dc849c7e49d6c5553f courier-0.46.20040816.ebuild 10008
-MD5 dc1fdae09c0e0f686668d1874cd5062c courier-0.47.20041120.ebuild 8501
 MD5 7428e4492712d927ef9d824ed3e21d85 courier-0.46.20040902.ebuild 10010
-MD5 535cffcb048d8826f40b7d115f511ae1 courier-0.45.6.ebuild 9768
-MD5 67db4403029c3f5162f4610eeb3226af ChangeLog 15221
+MD5 ec6e99e5ac5920b16400d7125bcf0f78 ChangeLog 15467
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
@@ -15,14 +11,10 @@ MD5 1c43ee40b3a67f8c6f30fa0f08293211 files/digest-courier-0.46 66
 MD5 8396693e821bf04e8382d047cc740b5e files/digest-courier-0.47 66
 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
-MD5 28eba6ea784530a54e83fd33ee9402d6 files/digest-courier-0.46.20040816 75
 MD5 04278164118b43ab59e28746fe957787 files/digest-courier-0.46.20040825 75
 MD5 eaa47d52c853b14f1cd8e287403b8e99 files/digest-courier-0.46.20040902 75
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
-MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
 MD5 7bd4625b319ee834c65e73ec927cd2ff files/courier-init 5414
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
-MD5 69648b339eb8e8a7338c02dbab3a0403 files/digest-courier-0.47.20041113 75
-MD5 8df7a3c2e79b090de4822698adda09ab files/digest-courier-0.47.20041120 75
 MD5 548c02d9627ea67bf8109dcf960a60c8 files/digest-courier-0.47.20041129 75
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
diff --git a/mail-mta/courier/courier-0.45.6.ebuild b/mail-mta/courier/courier-0.45.6.ebuild
deleted file mode 100644 (file)
index b835331..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.45.6.ebuild,v 1.7 2004/11/29 22:54:38 ticho Exp $
-
-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/libc
-       >=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}
-       virtual/fam
-       dev-lang/perl
-       sys-apps/procps"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       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
-
-       insinto /usr/lib/courier/courier
-       insopts -m  755 -o mail -g mail
-       doins ${S}/courier/webmaild
-
-       # 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 imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-}
-
-pkg_postinst() {
-       cd ${S}
-       make install-configure
-
-       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
-       ewarn "There is one init script (/etc/init.d/courier)."
-       ewarn "Each component is activated by a line in its config"
-       ewarn "which is in /etc/courier:"
-       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"
-       ebeep 5
-}
-
-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.46.20040816.ebuild b/mail-mta/courier/courier-0.46.20040816.ebuild
deleted file mode 100644 (file)
index aec8b9a..0000000
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.46.20040816.ebuild,v 1.3 2004/11/29 22:54:38 ticho Exp $
-
-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/libc
-       >=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}
-       virtual/fam
-       dev-lang/perl
-       sys-apps/procps"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       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
-}
-
-set_dollarmaildir() {
-       local files=$*
-
-       origmaildir='Maildir'
-       newmaildir='$MAILDIRPATH'
-
-       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
-       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
-
-       insinto /usr/lib/courier/courier
-       insopts -m  755 -o mail -g mail
-       doins ${S}/courier/webmaild
-
-       # 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_dollarmaildir 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 imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-}
-
-pkg_postinst() {
-       cd ${S}
-       make install-configure
-
-       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
-       ewarn "There is one init script (/etc/init.d/courier)."
-       ewarn "Each component is activated by a line in its config"
-       ewarn "which is in /etc/courier:"
-       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"
-       ebeep 5
-}
-
-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.47.20041113.ebuild b/mail-mta/courier/courier-0.47.20041113.ebuild
deleted file mode 100644 (file)
index 059620f..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041113.ebuild,v 1.6 2004/11/29 22:54:38 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-#KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~mips"
-KEYWORDS="-*"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper"
-
-PROVIDE="virtual/mta
-        virtual/mda
-        virtual/imapd"
-
-DEPEND="virtual/libc
-       net-libs/courier-authlib
-       >=dev-libs/openssl-0.9.6
-       >=sys-libs/gdbm-1.8.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 )
-       mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-       !mailwrapper? ( !virtual/mta )
-       !virtual/mda
-       !virtual/imapd"
-
-RDEPEND="${DEPEND}
-       virtual/fam
-       dev-lang/perl
-       sys-apps/procps"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       use norewrite && epatch ${FILESDIR}/norewrite.patch
-       use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-       local myconf
-       myconf="`use_with spell ispell` `use_with ipv6` \
-                       `use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-                       `use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-       use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-       [ -e /etc/apache/conf/mime.types ] && \
-               myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-       [ -e /etc/apache2/conf/mime.types ] && \
-               myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-
-       einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-       ./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 \
-               --with-db=gdbm \
-               --disable-autorenamesent \
-               --cache-file=${S}/configuring.cache \
-               --host=${CHOST} ${myconf} debug=true || die "./configure"
-       emake || die "Compile problem"
-}
-
-etc_courier() {
-       # Import existing /etc/courier/file if it exists.
-       # Add option only if it was not already set or even commented out
-       file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-       [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-                       cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-       grep -q "${word}" "${D}/etc/courier/${file}" || \
-               echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-       file="${1}" ; key="${2}" ; value="${3}"
-       grep -q "${key}" "${file}" && einfo "Changing ${file}: ${key} to ${value}"
-       sed -i -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-       #sed -i.x -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-       #diff "${file}.x" "${file}" ; rm "${file}.x"
-}
-
-set_maildir() {
-       local f ; local files=$*
-       origmaildir='Maildir'
-       newmaildir='.maildir'
-       for f in ${files} ; do
-               grep -q "${origmaildir}" "${f}" && \
-                       einfo "Changing ${origmaildir} in ${f} to ${newmaildir}"
-               sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-       done
-}
-
-src_install() {
-       local f
-       dodir /etc/pam.d
-       dodir /var/lib/courier
-       dodir /var/run/courier
-       make install DESTDIR=${D} || die "install"
-       make install-configure || die "install-configure"
-       diropts -o mail -g mail
-       for dir2keep in `(cd ${D} && find . -type d)` ; do
-               keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-       done
-
-       einfo "Setting up maildirs in the account skeleton ..."
-       diropts -m 755 -o root -g root
-       keepdir /etc/skel
-       ${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-       keepdir /var/spool/mail
-       ${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/courier-init courier
-       `grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-               newexe ${FILESDIR}/courier courier-old
-
-       cd ${D}/etc/courier
-       insinto /etc/courier
-       newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-       mv imapd.authpam imap.authpam ; mv pop3d.authpam pop3.authpam
-       for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-       for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-       [ -e ldapaliasrc ] && chown mail:root ldapaliasrc
-       set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-       ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-               > ${D}/etc/courier/sizelimit
-       etc_courier maildroprc ""
-       etc_courier esmtproutes ""
-       etc_courier backuprelay ""
-       etc_courier locallowercase ""
-       etc_courier bofh "opt BOFHBADMIME=accept"
-       etc_courier bofh "opt BOFHSPFTRUSTME=1"
-       etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-       etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-       etc_courier bofh "opt BOFHSPFFROM=all"
-       etc_courier bofh "opt BOFHSPFMAILFROM=all"
-       etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-       etc_courier esmtpd "BOFHBADMIME=accept"
-       etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-       etc_courier esmtpd-msa "BOFHBADMIME=accept"
-       etc_courier_chg esmtpd ESMTPDSTART YES
-       etc_courier_chg esmtpd-msa ESMTPDSTART YES
-       etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-       etc_courier_chg imapd IMAPDSTART YES
-       etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-       etc_courier_chg pop3d POP3DSTART YES
-       etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-       cd ${S}
-       cp imap/README README.imap
-       use nls && cp unicode/README README.unicode
-       dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-       dodoc tcpd/README.couriertls
-       echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-               >> ${D}/usr/share/doc/${P}/README.htmldocs
-
-       insinto /usr/lib/courier/courier
-       insopts -m  755 -o mail -g mail
-       doins ${S}/courier/webmaild
-       insinto /etc/courier/webadmin
-       insopts -m 400 -o mail -g mail
-       doins ${FILESDIR}/password.dist
-
-       # avoid name collisions in /usr/sbin, make webadmin match
-       cd ${D}/usr/sbin
-       for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
-       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"
-
-       if use mailwrapper ; then
-               mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-               rm ${D}/usr/bin/rmail
-               insinto /etc/mail
-               doins ${FILESDIR}/mailer.conf
-       else
-               dosym /usr/bin/sendmail /usr/sbin/sendmail
-       fi
-}
-
-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.47.20041120.ebuild b/mail-mta/courier/courier-0.47.20041120.ebuild
deleted file mode 100644 (file)
index affa5ba..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041120.ebuild,v 1.2 2004/11/29 22:54:38 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="An MTA designed specifically for maildirs"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-#KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~mips"
-KEYWORDS="-*"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper"
-
-PROVIDE="virtual/mta
-        virtual/mda
-        virtual/imapd"
-
-DEPEND="virtual/libc
-       net-libs/courier-authlib
-       >=dev-libs/openssl-0.9.6
-       >=sys-libs/gdbm-1.8.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 )
-       mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-       !mailwrapper? ( !virtual/mta )
-       !virtual/mda
-       !virtual/imapd"
-
-RDEPEND="${DEPEND}
-       virtual/fam
-       dev-lang/perl
-       sys-apps/procps"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       use norewrite && epatch ${FILESDIR}/norewrite.patch
-       use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-}
-
-src_compile() {
-       local myconf
-       myconf="`use_with spell ispell` `use_with ipv6` \
-                       `use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
-                       `use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
-       use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
-
-       [ -e /etc/apache/conf/mime.types ] && \
-               myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
-       [ -e /etc/apache2/conf/mime.types ] && \
-               myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
-
-       einfo "Configuring courier: `echo ${myconf} | xargs echo`"
-       ./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 \
-               --with-db=gdbm \
-               --disable-autorenamesent \
-               --cache-file=${S}/configuring.cache \
-               --host=${CHOST} ${myconf} debug=true || die "./configure"
-       emake || die "Compile problem"
-}
-
-etc_courier() {
-       # Import existing /etc/courier/file if it exists.
-       # Add option only if it was not already set or even commented out
-       file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
-       [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
-                       cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
-       grep -q "${word}" "${D}/etc/courier/${file}" || \
-               echo "${2}" >> "${D}/etc/courier/${file}"
-}
-
-etc_courier_chg() {
-       file="${1}" ; key="${2}" ; value="${3}"
-       grep -q "${key}" "${file}" && einfo "Changing ${file}: ${key} to ${value}"
-       sed -i -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-       #sed -i.x -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
-       #diff "${file}.x" "${file}" ; rm "${file}.x"
-}
-
-set_maildir() {
-       local f ; local files=$*
-       origmaildir='Maildir'
-       newmaildir='.maildir'
-       for f in ${files} ; do
-               grep -q "${origmaildir}" "${f}" && \
-                       einfo "Changing ${origmaildir} in ${f} to ${newmaildir}"
-               sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
-       done
-}
-
-src_install() {
-       local f
-       dodir /etc/pam.d
-       dodir /var/lib/courier
-       dodir /var/run/courier
-       make install DESTDIR=${D} || die "install"
-       make install-configure || die "install-configure"
-       diropts -o mail -g mail
-       for dir2keep in `(cd ${D} && find . -type d)` ; do
-               keepdir $dir2keep || die "failed running keepdir: $dir2keep"
-       done
-
-       einfo "Setting up maildirs in the account skeleton ..."
-       diropts -m 755 -o root -g root
-       keepdir /etc/skel
-       ${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
-       keepdir /var/spool/mail
-       ${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
-
-       exeinto /etc/init.d
-       newexe ${FILESDIR}/courier-init courier
-       `grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
-               newexe ${FILESDIR}/courier courier-old
-
-       cd ${D}/etc/courier
-       insinto /etc/courier
-       newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
-       mv imapd.authpam imap.authpam ; mv pop3d.authpam pop3.authpam
-       for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
-       for f in *.dist ; do cp ${f} ${f%%.dist} ; done
-       [ -e ldapaliasrc ] && chown mail:root ldapaliasrc
-       set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
-
-       ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
-               > ${D}/etc/courier/sizelimit
-       etc_courier maildroprc ""
-       etc_courier esmtproutes ""
-       etc_courier backuprelay ""
-       etc_courier locallowercase ""
-       etc_courier bofh "opt BOFHBADMIME=accept"
-       etc_courier bofh "opt BOFHSPFTRUSTME=1"
-       etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
-       etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
-       etc_courier bofh "opt BOFHSPFFROM=all"
-       etc_courier bofh "opt BOFHSPFMAILFROM=all"
-       etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
-       etc_courier esmtpd "BOFHBADMIME=accept"
-       etc_courier esmtpd-ssl "BOFHBADMIME=accept"
-       etc_courier esmtpd-msa "BOFHBADMIME=accept"
-       etc_courier_chg esmtpd ESMTPDSTART YES
-       etc_courier_chg esmtpd-msa ESMTPDSTART YES
-       etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
-       etc_courier_chg imapd IMAPDSTART YES
-       etc_courier_chg imapd-ssl IMAPDSSLSTART YES
-       etc_courier_chg pop3d POP3DSTART YES
-       etc_courier_chg pop3d-ssl POP3DSSLSTART YES
-
-       cd ${S}
-       cp imap/README README.imap
-       use nls && cp unicode/README README.unicode
-       dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
-       dodoc tcpd/README.couriertls
-       echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
-               >> ${D}/usr/share/doc/${P}/README.htmldocs
-
-       insinto /usr/lib/courier/courier
-       insopts -m  755 -o mail -g mail
-       doins ${S}/courier/webmaild
-       insinto /etc/courier/webadmin
-       insopts -m 400 -o mail -g mail
-       doins ${FILESDIR}/password.dist
-
-       # avoid name collisions in /usr/sbin, make webadmin match
-       cd ${D}/usr/sbin
-       for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
-       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"
-
-       if use mailwrapper ; then
-               mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
-               rm ${D}/usr/bin/rmail
-               insinto /etc/mail
-               doins ${FILESDIR}/mailer.conf
-       else
-               dosym /usr/bin/sendmail /usr/sbin/sendmail
-       fi
-}
-
-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
-}
index 7416fcc9b25b179efb38a02dc4b97dc83a732dcf..3d82413c4c42f4b2de7f1b650650f659b4823627 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041129.ebuild,v 1.1 2004/12/01 11:21:27 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041129.ebuild,v 1.2 2004/12/01 18:26:25 swtaylor Exp $
 
 inherit eutils
 
@@ -10,8 +10,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-#KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~mips"
-KEYWORDS="-*"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~mips"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper"
 
 PROVIDE="virtual/mta
index d8bfe7421d44773f72865f86f376c716ae959cca..6da06c5d9d894f5425acd11393d0e1acc7bb1399 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.ebuild,v 1.4 2004/11/29 22:54:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.ebuild,v 1.5 2004/12/01 18:26:25 swtaylor Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~mips"
+KEYWORDS="x86 alpha ppc sparc amd64 ~mips"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc"
 
 PROVIDE="virtual/mta
diff --git a/mail-mta/courier/files/digest-courier-0.45.6 b/mail-mta/courier/files/digest-courier-0.45.6
deleted file mode 100644 (file)
index 9e78b2a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da08b5f7d2fc9f4a871a5584914011c6 courier-0.45.6.tar.bz2 4310616
diff --git a/mail-mta/courier/files/digest-courier-0.46.20040816 b/mail-mta/courier/files/digest-courier-0.46.20040816
deleted file mode 100644 (file)
index 55f6a42..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 634cd42eabc44d5b1eeae94ae8e6eafa courier-0.46.20040816.tar.bz2 4261793
diff --git a/mail-mta/courier/files/digest-courier-0.47.20041113 b/mail-mta/courier/files/digest-courier-0.47.20041113
deleted file mode 100644 (file)
index c475249..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15c6662f612355f4d0528d7334bd9f2e courier-0.47.20041113.tar.bz2 5872069
diff --git a/mail-mta/courier/files/digest-courier-0.47.20041120 b/mail-mta/courier/files/digest-courier-0.47.20041120
deleted file mode 100644 (file)
index 06e652c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01c57e8d334fedab732aa637e415307c courier-0.47.20041120.tar.bz2 5873362