Add patch from Ed Catmur to work with PAM 0.99 (and in general without pam_stack). Thanks Ed. See bug #177748.

Package-Manager: portage-2.1.3_rc6

7 files changed, 778 insertions, 5 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index f2aac6d42807..22448cbe4da2 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.90 2007/05/30 16:21:48 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.91 2007/07/04 19:57:20 flameeyes Exp $
+
+*courier-0.55.1-r1 (04 Jul 2007)
+*courier-0.53.2-r1 (04 Jul 2007)
+
+  04 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pam-include.patch, +courier-0.53.2-r1.ebuild,
+  +courier-0.55.1-r1.ebuild:
+  Add patch from Ed Catmur to work with PAM 0.99 (and in general without
+  pam_stack). Thanks Ed. See bug #177748.
 
 *courier-0.55.1 (30 May 2007)
 
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 72b53e5a6aeb..c82b7ae179e8 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 files/apache-sqwebmail.inc 347
@@ -38,6 +41,10 @@ AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007
 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 files/norewrite.patch 489
 SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4 files/norewrite.patch 489
+AUX pam-include.patch 1534 RMD160 20456564341339c661ee20efe6b830f9df484b7e SHA1 318d1ae44e946c3809f56476ab02d0f851bc981c SHA256 2f0ea30cffdfec5d0f2ce3aece3e5ea2717ae6d04918210a0b9247a30fc15782
+MD5 ad4c2441c23406c10e1e0b9697f573ff files/pam-include.patch 1534
+RMD160 20456564341339c661ee20efe6b830f9df484b7e files/pam-include.patch 1534
+SHA256 2f0ea30cffdfec5d0f2ce3aece3e5ea2717ae6d04918210a0b9247a30fc15782 files/pam-include.patch 1534
 AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5bcf561f7267be6f18b731813962030af166 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 files/password.dist 247
@@ -48,18 +55,26 @@ RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad files/set-mime 741
 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f files/set-mime 741
 DIST courier-0.53.2.tar.bz2 6942557 RMD160 a6efce3a8d6572923190ea49ed6085906317ebd8 SHA1 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3 SHA256 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
 DIST courier-0.55.1.tar.bz2 7019376 RMD160 43b4e5868a3e450cbc238cae0ba411011c1fa49f SHA1 a4b83a1fa018abd9d32b946b6407764ad2d98993 SHA256 caec49a2fed5c2048ea69fc290dc01402bf0dfc7852d2e1865e35ae15ce1eea6
+EBUILD courier-0.53.2-r1.ebuild 11850 RMD160 6c57adfaa3c4e9a7cc55c6af60be8891085ec65e SHA1 d9ba9a6576be146397aa9491429bfc7cbb4f41df SHA256 2dc5398c7d53256a65fff1e9ad31f6fb96b945532682eaf3f32376e00097351e
+MD5 8a3f881e66f1f7bf2fc4b1d363c345c8 courier-0.53.2-r1.ebuild 11850
+RMD160 6c57adfaa3c4e9a7cc55c6af60be8891085ec65e courier-0.53.2-r1.ebuild 11850
+SHA256 2dc5398c7d53256a65fff1e9ad31f6fb96b945532682eaf3f32376e00097351e courier-0.53.2-r1.ebuild 11850
 EBUILD courier-0.53.2.ebuild 11807 RMD160 f0f5e26778cca5357c5540f22919970944b63999 SHA1 dc4e746e8a34199e28f2bbad30b121c8b37d27f0 SHA256 3797023c2ab8d099aa25c4a8213d64687db852eecbb879d0d4149b1101674dcd
 MD5 0c4041fdc2a3e7304be03a6dcd5cc750 courier-0.53.2.ebuild 11807
 RMD160 f0f5e26778cca5357c5540f22919970944b63999 courier-0.53.2.ebuild 11807
 SHA256 3797023c2ab8d099aa25c4a8213d64687db852eecbb879d0d4149b1101674dcd courier-0.53.2.ebuild 11807
+EBUILD courier-0.55.1-r1.ebuild 11850 RMD160 825d50771b56434b08fcd72c4c97088b846211c8 SHA1 50b765475957902668af96cfbcde3eaa1b5fe61f SHA256 ef5a6528cde63b4872914a48f797fe425099d0e28e682bf3014ffa1555ed94af
+MD5 b732183f668e1f01ada89d7ee507341f courier-0.55.1-r1.ebuild 11850
+RMD160 825d50771b56434b08fcd72c4c97088b846211c8 courier-0.55.1-r1.ebuild 11850
+SHA256 ef5a6528cde63b4872914a48f797fe425099d0e28e682bf3014ffa1555ed94af courier-0.55.1-r1.ebuild 11850
 EBUILD courier-0.55.1.ebuild 11810 RMD160 81f1688e1e65ad529c3ddc43a6ba4b2a33d9053c SHA1 160413349f290e9373ae39e8a86f94c6d75f146b SHA256 29a5aff5f3761813331f0e79e8a567c27a1f64e087f374da604788d6b782e70d
 MD5 9af85267ba1dfff1786f0b912ba185e2 courier-0.55.1.ebuild 11810
 RMD160 81f1688e1e65ad529c3ddc43a6ba4b2a33d9053c courier-0.55.1.ebuild 11810
 SHA256 29a5aff5f3761813331f0e79e8a567c27a1f64e087f374da604788d6b782e70d courier-0.55.1.ebuild 11810
-MISC ChangeLog 25957 RMD160 8bef724a116e6e4088b8d1fdd8ba9b33c1182719 SHA1 32197468a7b9a936fb4c5ff3765e1b08dc2842f6 SHA256 55c1f879b8338359e0a0c3e20833ffd26be24c41131681bc9fc2da178462ed91
-MD5 c65a8190f471bc4c03933d6630260037 ChangeLog 25957
-RMD160 8bef724a116e6e4088b8d1fdd8ba9b33c1182719 ChangeLog 25957
-SHA256 55c1f879b8338359e0a0c3e20833ffd26be24c41131681bc9fc2da178462ed91 ChangeLog 25957
+MISC ChangeLog 26281 RMD160 0d8332fd5fd3109759be39c46e3e12ad85668a4d SHA1 3d93a40796367a9352cd461c06cd8b09f44b1d56 SHA256 cbbe48645ae1483498347977ed276bc9d257511f28d011c30e97feebb4a4a0f0
+MD5 f5994b548a95f7a9e81a945e0a98051a ChangeLog 26281
+RMD160 0d8332fd5fd3109759be39c46e3e12ad85668a4d ChangeLog 26281
+SHA256 cbbe48645ae1483498347977ed276bc9d257511f28d011c30e97feebb4a4a0f0 ChangeLog 26281
 MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0
 MD5 60cd65a0c4aa59722fb87b67f5be2db1 metadata.xml 322
 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 metadata.xml 322
@@ -67,6 +82,19 @@ SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0 metadata
 MD5 18161922435984d1b48bfd5ef77528c7 files/digest-courier-0.53.2 250
 RMD160 105e1e4d06100267d18e5966e8b703422620d0e7 files/digest-courier-0.53.2 250
 SHA256 5536a2aa5dbdcf92f70d35abef705c52cdfb4e55dea28c3be5fcfae1b5297d41 files/digest-courier-0.53.2 250
+MD5 18161922435984d1b48bfd5ef77528c7 files/digest-courier-0.53.2-r1 250
+RMD160 105e1e4d06100267d18e5966e8b703422620d0e7 files/digest-courier-0.53.2-r1 250
+SHA256 5536a2aa5dbdcf92f70d35abef705c52cdfb4e55dea28c3be5fcfae1b5297d41 files/digest-courier-0.53.2-r1 250
 MD5 4ec392499fdde6110fa44eb36f1d22c8 files/digest-courier-0.55.1 250
 RMD160 ab529ea216a757f2b3599ba97467c58af22ff8a9 files/digest-courier-0.55.1 250
 SHA256 fb5de5652b7635e020bf2eb60db1221cdde1c3f4cfb3cc6ca227bbc242cc25ff files/digest-courier-0.55.1 250
+MD5 4ec392499fdde6110fa44eb36f1d22c8 files/digest-courier-0.55.1-r1 250
+RMD160 ab529ea216a757f2b3599ba97467c58af22ff8a9 files/digest-courier-0.55.1-r1 250
+SHA256 fb5de5652b7635e020bf2eb60db1221cdde1c3f4cfb3cc6ca227bbc242cc25ff files/digest-courier-0.55.1-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGi/vKAiZjviIA2XgRAu1eAKDSJjFBfNKza8i1Br/hEPplqPjoDwCg4N24
+xFp2KMycnGJ+ubScN1neTRo=
+=Wv62
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.53.2-r1.ebuild b/mail-mta/courier/courier-0.53.2-r1.ebuild
new file mode 100644
index 000000000000..58c0e5f74350
--- /dev/null
+++ b/mail-mta/courier/courier-0.53.2-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2-r1.ebuild,v 1.1 2007/07/04 19:57:20 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+S="${WORKDIR}/${P%%_pre}"
+
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.55
+	>=dev-libs/openssl-0.9.6
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	|| ( app-misc/mime-types net-www/apache )
+	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1.3 )
+	spell? ( virtual/aspell-dict )
+	fam? ( virtual/fam )
+	!mailwrapper? ( !virtual/mta )
+	!virtual/imapd
+	!mail-filter/maildrop"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+filter-flags '-fomit-frame-pointer'
+
+src_unpack() {
+	use fam || (
+		ewarn "File Alteration Monitor (FAM) is disabled"
+		ewarn "courier-imap will fall back to 60 second polls."
+		ewarn 'add "fam" to your USE flags to build as usual'
+		ebeep 4
+		epause 4 )
+	unpack ${A}
+	cd ${S}
+	use norewrite && epatch ${FILESDIR}/norewrite.patch
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+
+	epatch "${FILESDIR}/pam-include.patch"
+
+	# disable link to fam.
+	epatch ${FILESDIR}/fam-disable-check.patch
+	cd ${S}/maildir
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	myconf="`use_with ipv6` \
+		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+	use spell || myconf="${myconf} --without-ispell"
+
+	[ -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"
+	[ -e /etc/mime.types ] && \
+		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
+
+	myconf="${myconf} $(use_with fam)"
+
+	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
+
+	econf \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--libexecdir=/usr/$(get_libdir)/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"
+	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile
+	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}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+set_maildir() {
+	local f ; local files=$*
+	origmaildir='Maildir'
+	newmaildir='.maildir'
+	for f in ${files} ; do
+		grep -q "${origmaildir}" "${f}" && \
+			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
+		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
+	done
+}
+
+src_install() {
+	local f
+	einfo "Setting up maildirs in the account skeleton ..."
+	diropts -m 755 -o root -g root
+	dodir /etc/skel
+	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
+	keepdir /etc/skel/.maildir
+
+	diropts -o mail -g mail
+	keepdir /var/run/courier
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR=${D} || die "install"
+	make install-configure || die "install-configure"
+
+	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd ${FILESDIR}/courier-init-r1 courier
+	use fam || sed -i -e's|^.*use famd$||g' ${D}/etc/init.d/courier
+
+	cd ${D}/etc/courier
+	insinto /etc/courier
+	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
+
+	if use pam ; then
+		dodir /etc/pam.d
+		rm imapd.authpam pop3d.authpam
+		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
+	fi
+
+	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
+	[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 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 ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
+	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
+	etc_courier_chg esmtpd-msa ESMTPDSTART YES
+	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
+	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
+	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
+	etc_courier_chg imapd IMAPDSTART YES
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
+	etc_courier_chg pop3d POP3DSTART YES
+	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	rm ${D}/usr/sbin/{pop3d,imapd}{,-ssl}
+	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
+	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	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/$(get_libdir)/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
+		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
+		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
+
+		mv ${D}/usr/share/man/man1/sendmail.1 \
+			${D}/usr/share/man/man1/sendmail-courier.1
+		mv ${D}/usr/share/man/man1/mailq.1 \
+			${D}/usr/share/man/man1/mailq-courier.1
+		mv ${D}/usr/share/man/man1/rmail.1 \
+			${D}/usr/share/man/man1/rmail-courier.1
+
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	else
+		dosym /usr/bin/sendmail /usr/sbin/sendmail
+	fi
+}
+
+src_test() {
+	addpredict /
+	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	if hasq userpriv ${FEATURES} ; then
+		if ! emake -j1 check; then
+			hasq test ${FEATURES} && die "Make check failed. See above for details."
+			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
+		fi
+	else
+		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
+	fi
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+
+	# fix for bug #99334
+	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
+	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
+	elog "See also: http://www.courier-mta.org/install.html#suid"
+}
+
+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.55.1-r1.ebuild b/mail-mta/courier/courier-0.55.1-r1.ebuild
new file mode 100644
index 000000000000..756b1846e356
--- /dev/null
+++ b/mail-mta/courier/courier-0.55.1-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.1 2007/07/04 19:57:20 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+S="${WORKDIR}/${P%%_pre}"
+
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper fam"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.59
+	>=dev-libs/openssl-0.9.6
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	|| ( app-misc/mime-types net-www/apache )
+	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1.3 )
+	spell? ( virtual/aspell-dict )
+	fam? ( virtual/fam )
+	!mailwrapper? ( !virtual/mta )
+	!virtual/imapd
+	!mail-filter/maildrop"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+filter-flags '-fomit-frame-pointer'
+
+src_unpack() {
+	use fam || (
+		ewarn "File Alteration Monitor (FAM) is disabled"
+		ewarn "courier-imap will fall back to 60 second polls."
+		ewarn 'add "fam" to your USE flags to build as usual'
+		ebeep 4
+		epause 4 )
+	unpack ${A}
+	cd ${S}
+	use norewrite && epatch ${FILESDIR}/norewrite.patch
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+
+	epatch "${FILESDIR}/pam-include.patch"
+
+	# disable link to fam.
+	epatch ${FILESDIR}/fam-disable-check.patch
+	cd ${S}/maildir
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	myconf="`use_with ipv6` \
+		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+	use spell || myconf="${myconf} --without-ispell"
+
+	[ -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"
+	[ -e /etc/mime.types ] && \
+		myconf="${myconf} --enable-mimetypes=/etc/mime.types"
+
+	myconf="${myconf} $(use_with fam)"
+
+	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
+
+	econf \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--libexecdir=/usr/$(get_libdir)/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"
+	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'${D}'|g\" -i permissions.dat' -i Makefile
+	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}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+set_maildir() {
+	local f ; local files=$*
+	origmaildir='Maildir'
+	newmaildir='.maildir'
+	for f in ${files} ; do
+		grep -q "${origmaildir}" "${f}" && \
+			elog "Changing ${origmaildir} in ${f} to ${newmaildir}"
+		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
+	done
+}
+
+src_install() {
+	local f
+	einfo "Setting up maildirs in the account skeleton ..."
+	diropts -m 755 -o root -g root
+	dodir /etc/skel
+	${S}/maildir/maildirmake ${D}/etc/skel/.maildir
+	keepdir /etc/skel/.maildir
+
+	diropts -o mail -g mail
+	keepdir /var/run/courier
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR=${D} || die "install"
+	make install-configure || die "install-configure"
+
+	for dir2keep in `(cd ${D} && find ./var/lib/courier -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd ${FILESDIR}/courier-init-r1 courier
+	use fam || sed -i -e's|^.*use famd$||g' ${D}/etc/init.d/courier
+
+	cd ${D}/etc/courier
+	insinto /etc/courier
+	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
+
+	if use pam ; then
+		dodir /etc/pam.d
+		rm imapd.authpam pop3d.authpam
+		for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
+	fi
+
+	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
+	[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 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 ESMTPAUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg esmtpd ESMTPAUTH_WEBADMIN "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg esmtpd ESMTPAUTH_TLS "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
+	etc_courier_chg esmtpd ESMTPAUTH_TLS_WEBADMIN "PLAIN LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256" ESMTPAUTHINFOTLS
+	etc_courier_chg esmtpd-msa ESMTPDSTART YES
+	etc_courier_chg esmtpd-msa AUTH_REQUIRED 1
+	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
+	etc_courier_chg esmtpd-ssl AUTH_REQUIRED 1
+	etc_courier_chg imapd IMAPDSTART YES
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
+	etc_courier_chg pop3d POP3DSTART YES
+	etc_courier_chg pop3d POP3AUTH "LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg pop3d POP3AUTH_TLS "LOGIN PLAIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
+	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	rm ${D}/usr/sbin/{pop3d,imapd}{,-ssl}
+	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
+	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	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/$(get_libdir)/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
+		mv ${D}/usr/bin/rmail ${D}/usr/bin/rmail.courier
+		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.courier
+
+		mv ${D}/usr/share/man/man1/sendmail.1 \
+			${D}/usr/share/man/man1/sendmail-courier.1
+		mv ${D}/usr/share/man/man1/mailq.1 \
+			${D}/usr/share/man/man1/mailq-courier.1
+		mv ${D}/usr/share/man/man1/rmail.1 \
+			${D}/usr/share/man/man1/rmail-courier.1
+
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	else
+		dosym /usr/bin/sendmail /usr/sbin/sendmail
+	fi
+}
+
+src_test() {
+	addpredict /
+	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	if hasq userpriv ${FEATURES} ; then
+		if ! emake -j1 check; then
+			hasq test ${FEATURES} && die "Make check failed. See above for details."
+			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
+		fi
+	else
+		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
+	fi
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+
+	# fix for bug #99334
+	elog "Courier's sendmail is not suid by default, therefore non-root users can't send"
+	elog "mail using sendmail. If you need this to work, you should set sendmail suid."
+	elog "See also: http://www.courier-mta.org/install.html#suid"
+}
+
+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/files/digest-courier-0.53.2-r1 b/mail-mta/courier/files/digest-courier-0.53.2-r1
new file mode 100644
index 000000000000..b85c6512fafb
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.53.2-r1
@@ -0,0 +1,3 @@
+MD5 9ac1f892dcd2505a85d4e60edb61120c courier-0.53.2.tar.bz2 6942557
+RMD160 a6efce3a8d6572923190ea49ed6085906317ebd8 courier-0.53.2.tar.bz2 6942557
+SHA256 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726 courier-0.53.2.tar.bz2 6942557
diff --git a/mail-mta/courier/files/digest-courier-0.55.1-r1 b/mail-mta/courier/files/digest-courier-0.55.1-r1
new file mode 100644
index 000000000000..437f43f48d83
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.55.1-r1
@@ -0,0 +1,3 @@
+MD5 8d5d1c767863d4b1908429b6b1e5e262 courier-0.55.1.tar.bz2 7019376
+RMD160 43b4e5868a3e450cbc238cae0ba411011c1fa49f courier-0.55.1.tar.bz2 7019376
+SHA256 caec49a2fed5c2048ea69fc290dc01402bf0dfc7852d2e1865e35ae15ce1eea6 courier-0.55.1.tar.bz2 7019376
diff --git a/mail-mta/courier/files/pam-include.patch b/mail-mta/courier/files/pam-include.patch
new file mode 100644
index 000000000000..a56cac6c39d4
--- /dev/null
+++ b/mail-mta/courier/files/pam-include.patch
@@ -0,0 +1,36 @@
+--- courier-0.53.2/webmail/sqwebmail-system-auth.pamconf	2007/05/10 05:49:26	1.1
++++ courier-0.53.2/webmail/sqwebmail-system-auth.pamconf	2007/05/13 18:19:03
+@@ -5,10 +5,10 @@
+ # Copyright 1998-2001 Double Precision, Inc.  See COPYING for
+ # distribution information.
+ #
+-# This is a sample authpam configuration file that uses pam_stack
+-# (circa linux-pam 0.72).
++# This is a sample authpam configuration file that uses include statements
++# (circa linux-pam 0.78).
+ 
+ auth       required     pam_nologin.so
+-auth       required     pam_stack.so service=system-auth
+-account    required     pam_stack.so service=system-auth
+-session    required     pam_stack.so service=system-auth
++auth       include	system-auth
++account    include	system-auth
++session    include	system-auth
+--- courier-0.53.2/imap/system-auth.authpam	2007/05/13 19:03:10	1.1
++++ courier-0.53.2/imap/system-auth.authpam	2007/05/13 19:04:03
+@@ -5,10 +5,10 @@
+ # Copyright 1998-2001 Double Precision, Inc.  See COPYING for
+ # distribution information.
+ #
+-# This is a sample authpam configuration file that uses pam_stack
+-# (circa linux-pam 0.72).
++# This is a sample authpam configuration file that uses include statements
++# (circa linux-pam 0.78).
+ 
+ auth       required     pam_nologin.so
+-auth       required     pam_stack.so service=system-auth
+-account    required     pam_stack.so service=system-auth
+-session    required     pam_stack.so service=system-auth
++auth       include	system-auth
++account    include	system-auth
++session    include	system-auth