keks-overlay.git

@@ -1,9 +0,0 @@

-AUX apache-sqwebmail.inc 347 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65 SHA512 e3f8f4f01563184ec4afc98d61ab739d5900f7d8757638fb06ff21ca3604f8c6f708730af514f6ca662559980503dee5955ba48c5a643e473054f3eec49b89a0 WHIRLPOOL e586f1bcf82af87df2285ec142f92056fd25df515b2cdc1027d62a97a26ba8205204c192c0bf0b59fb636ca84f70baadd79ea8a60bf9cb97db34e2b66aaee8f4

-AUX courier-fix-ld.diff 5630 SHA256 6a54ba0b626753bf196c48a5d706fdca34a135985231eb6121c28d9f09f261fa SHA512 d7e2b022d7baadeeba0d52e4a2be00271c33f1da1737cdbfbe892d7fdd71479c1dcb8fc4f31d2f01dc1c303b88d1bd8a36a5ebb1e108397fa485b6450a51b438 WHIRLPOOL 9c9e2ab77f45685a519916d4c357606832e7824d9231c692078fb79eeebc5b207f692d212d51c6e8459d9bf3be06ba56afe30ced00afdbe33a39c00220923f25

-AUX courier-init-r4 5076 SHA256 69d826eb81803db8eb69aefc94e7d5fcdc2bb4fdc029b5bad2e486b94e71fe49 SHA512 30a575991a96110bbb79e30a7cf94c9cd5c87e364fa412f605a8856163707f04886e2955cf2b5b8a6f827ae45799adb15236fe5ea3e50fd2887dd0bf9596101f WHIRLPOOL 3218e0769b7184f8f11310f17572e1892ff6587b5ee2d9a53fa22222a320c4d5781e4974a485577c3f292acb3b914bac79bb91b18a59dfc7bc8a2a48c8b5b66f

-AUX norewrite.patch 489 SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4 SHA512 e9e95bd5d1a78b510f6dd7e155999089f123eecfdc16d3b5005b00981a7b6d29827cdddc61035ed3c3edcf0b9907ddfbae76df6503a1a8ef26b4de43a02bfc8e WHIRLPOOL c41a0b63a2109ac33532de0830257929995383d246eb3f84674e6fcf267ce5cc0b7e8ce339926429a7212f63aa117b5de65bc870f21b0a4a545f4b3f10827323

-AUX password.dist 247 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2 SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d WHIRLPOOL 98883b10ae103663d1d1205532e6c243bb462e9dc2adf1b9d6a968f9246283bbb2aabb8779ab5d8b7d052a5a3032f9d113ac74c773bf7591e81ccf086a2e51b3

-DIST courier-0.73.2.20140911.tar.bz2 6818008 SHA256 a87f6d57d36811514ab3d4edee330bd01043066350ebe0af52ca588f3bfc7e05 SHA512 008b6c5b6fc6f8efbe201456d1ed66a6be95e37336e146959b4c853ab22b7f07cdfdf9a61dd3cdb4db28ac623fbdd02d7a4b64b418941e426a435cf81f28c2fd WHIRLPOOL bf990b0f26a113488c8e40e0cc2ac2f11ac839fd6b601c0c9b9d32312b90adb2ab38cf0fa215637d06509f852a4cbaeb1996da1794448ecb3adc1399e50403e8

-DIST courier-0.73.2.20140921.tar.bz2 6818885 SHA256 3c661806040fecbfc7ca334fd5b35597db6503027da854330dffc23107129e11 SHA512 78c630062835a63a19bbc32df2fb759c4d310c3edc1c4c9209d4f64b20a236cbfa5f192e166a6de74f89319950fa1c55960c84b18f564a0ca0e05fc9daaee0cd WHIRLPOOL ea727e15a4d76d20b912807dac703cf7b8e833bad588c86abdba69cc4e107b3937b7e0abcb708964d90585b0b5b74dd4d03a7bf1568d808224522b07d7b6aae9

-EBUILD courier-0.73.2.20140911.ebuild 9326 SHA256 cf187272b003b43293c2a1d022f93507f8a6194f9ffe8f7e04620858482c5fb2 SHA512 851d86e3a31c595b6dec1bfd4ee1099fa132b1114f5cbe0414ba1fbba495deb5d7e78d405be5003838434badf0e48398320b9c690dd439072b944cb8e34ed314 WHIRLPOOL 81d4e4b4e706a8c89b393513ac1236b5da6953a695dae77492afecaa5dbe8258535f6dbb268588ed114307e6876417a054a7c92d71cfc8f99d58d6fcb1e8c54d

-EBUILD courier-0.73.2.20140921.ebuild 9284 SHA256 7107d81ca7255419abce45aaa9793ae064608e1538d2dd8ba9472d895408d35e SHA512 b77a8c018975ee7611ae717100df07cf256a800ecdc61dd913d8927b22f190eb434fe9aba065fc0bdf9bf6ac8748b277e23829b12d14ee9f70bf5b004af9f52b WHIRLPOOL 8c39d4bf2d3833f3b0fc0093d9a84a1034e5a5760e49247abe0933cef7349ba18e698ec7899de1e20b4663598620b9d347753936c4842222948b7012cf34087c

@@ -1,303 +0,0 @@

-# Copyright 1999-2014 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.71.ebuild,v 1.9 2014/01/18 19:52:19 ago Exp $

-

-inherit eutils flag-o-matic multilib

-

-DESCRIPTION="An MTA designed specifically for maildirs"

-SRC_URI="http://downloads.sourceforge.net/project/courier/courier-devel/20140911/${P}.tar.bz2"

-HOMEPAGE="http://www.courier-mta.org/"

-SLOT="0"

-LICENSE="GPL-2"

-KEYWORDS="~amd64"

-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \

-	fam web webmail gnutls"

-

-DEPEND="

-	>=net-libs/courier-authlib-0.66.1

-	net-libs/courier-unicode

-	!gnutls? ( >=dev-libs/openssl-0.9.6 )

-	gnutls? ( net-libs/gnutls )

-	>=sys-libs/gdbm-1.8.0

-	dev-libs/libpcre

-	app-misc/mime-types

-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )

-	pam? ( virtual/pam )

-	mysql? ( virtual/mysql )

-	ldap? ( >=net-nds/openldap-1.2.11 )

-	postgres? ( dev-db/postgresql-base )

-	spell? ( app-text/aspell )

-	fam? ( virtual/fam )

-	!mail-filter/maildrop

-	!mail-mta/esmtp

-	!mail-mta/exim

-	!mail-mta/mini-qmail

-	!mail-mta/msmtp

-	!mail-mta/netqmail

-	!mail-mta/nullmailer

-	!mail-mta/postfix

-	!mail-mta/qmail-ldap

-	!mail-mta/sendmail

-	!mail-mta/ssmtp

-	!mail-mta/opensmtpd

-	!net-mail/dot-forward

-	!sys-apps/ucspi-tcp

-	"

-

-RDEPEND="${DEPEND}

-	dev-lang/perl

-	sys-process/procps"

-

-# get rid of old style virtual/imapd - bug 350792

-# all blockers really needed?

-RDEPEND="${RDEPEND}

-	!net-mail/bincimap

-	!net-mail/courier-imap

-	!net-mail/cyrus-imapd

-	!net-mail/uw-imap"

-

-PDEPEND="pam? ( net-mail/mailbase )

-	crypt? ( >=app-crypt/gnupg-1.0.4 )"

-

-src_unpack() {

-	unpack ${A}

-	cd "${S}"

-	epatch "${FILESDIR}/courier-fix-ld.diff"

-	use norewrite && epatch "${FILESDIR}/norewrite.patch"

-}

-

-src_compile() {

-	filter-flags '-fomit-frame-pointer'

-

-	local myconf

-	myconf=""

-

-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"

-

-	econf ${myconf} \

-		$(use_with fam) \

-		$(use_with ipv6) \

-		$(use_with spell ispell) \

-		$(use_with ldap ldapaliasd) \

-		$(use_enable ldap maildroldap) \

-		$(use_with gnutls) \

-		--enable-mimetypes=/etc/mime.types \

-		--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}" 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}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}

-}

-

-src_install() {

-	local f

-	diropts -o mail -g mail

-	keepdir /var/lib/courier/tmp

-	keepdir /var/lib/courier/msgs

-	make install DESTDIR="${D}" || die "install"

-	make install-configure || die "install-configure"

-

-	# Get rid of files we dont want

-	if ! use webmail ; then

-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \

-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \

-			"${D}/usr/share/courier/sqwebmail/" \

-			"${D}/usr/sbin/webmaild" \

-			"${D}/usr/sbin/webgpg" \

-			"${D}/etc/courier/webmail.authpam" \

-			"${D}/var/lib/courier/webmail-logincache" \

-			"${D}"/etc/courier/sqwebmaild*

-	fi

-

-	if ! use web ; then

-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \

-			"${D}/etc/courier/webadmin"

-	fi

-

-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do

-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"

-	done

-

-	newinitd "${FILESDIR}/courier-init-r4" "courier"

-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"

-

-	cd "${D}/etc/courier"

-	if use webmail ; then

-		insinto /etc/courier

-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc

-	fi

-

-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done

-	if use ldap ; then

-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )

-	else

-		rm -f ldapaliasrc

-	fi

-

-	( [ -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"

-

-	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"

-

-	# Fix for a sandbox violation on subsequential merges

-	# - ticho@gentoo.org, 2005-07-10

-	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

-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"

-

-	if use webmail ; then

-		insinto /usr/$(get_libdir)/courier/courier

-		insopts -m 755 -o mail -g mail

-		doins "${S}/courier/webmaild"

-	fi

-

-	if use web ; then

-		insinto /etc/courier/webadmin

-		insopts -m 400 -o mail -g mail

-		doins "${FILESDIR}/password.dist"

-	fi

-

-	# 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

-	if use web ; then

-		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"

-	fi

-

-	# users should be able to send mail. Could be restricted with suictl.

-	chmod u+s "${D}/usr/bin/sendmail"

-

-	dosym /usr/bin/sendmail /usr/sbin/sendmail

-}

-

-src_test() {

-	if [ `whoami` != 'root' ]; then

-		emake -j1 check || die "Make check failed."

-	else

-		einfo "make check skipped, can't run as root."

-		einfo "You can enable it with FEATURES=\"userpriv\""

-	fi

-}

-

-pkg_postinst() {

-	use fam && elog "fam daemon is needed for courier-imapd" \

-		|| ewarn "courier was built without fam support"

-}

-

-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

-}

@@ -1,302 +0,0 @@

-# Copyright 1999-2014 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.71.ebuild,v 1.9 2014/01/18 19:52:19 ago Exp $

-

-inherit eutils flag-o-matic multilib

-

-DESCRIPTION="An MTA designed specifically for maildirs"

-SRC_URI="http://downloads.sourceforge.net/project/courier/courier-devel/20140921/${P}.tar.bz2"

-HOMEPAGE="http://www.courier-mta.org/"

-SLOT="0"

-LICENSE="GPL-2"

-KEYWORDS="~amd64"

-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \

-	fam web webmail gnutls"

-

-DEPEND="

-	>=net-libs/courier-authlib-0.66.1

-	net-libs/courier-unicode

-	!gnutls? ( >=dev-libs/openssl-0.9.6 )

-	gnutls? ( net-libs/gnutls )

-	>=sys-libs/gdbm-1.8.0

-	dev-libs/libpcre

-	app-misc/mime-types

-	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )

-	pam? ( virtual/pam )

-	mysql? ( virtual/mysql )

-	ldap? ( >=net-nds/openldap-1.2.11 )

-	postgres? ( dev-db/postgresql-base )

-	spell? ( app-text/aspell )

-	fam? ( virtual/fam )

-	!mail-filter/maildrop

-	!mail-mta/esmtp

-	!mail-mta/exim

-	!mail-mta/mini-qmail

-	!mail-mta/msmtp

-	!mail-mta/netqmail

-	!mail-mta/nullmailer

-	!mail-mta/postfix

-	!mail-mta/qmail-ldap

-	!mail-mta/sendmail

-	!mail-mta/ssmtp

-	!mail-mta/opensmtpd

-	!net-mail/dot-forward

-	!sys-apps/ucspi-tcp

-	"

-

-RDEPEND="${DEPEND}

-	dev-lang/perl

-	sys-process/procps"

-

-# get rid of old style virtual/imapd - bug 350792

-# all blockers really needed?

-RDEPEND="${RDEPEND}

-	!net-mail/bincimap

-	!net-mail/courier-imap

-	!net-mail/cyrus-imapd

-	!net-mail/uw-imap"

-

-PDEPEND="pam? ( net-mail/mailbase )

-	crypt? ( >=app-crypt/gnupg-1.0.4 )"

-

-src_unpack() {

-	unpack ${A}

-	cd "${S}"

-	use norewrite && epatch "${FILESDIR}/norewrite.patch"

-}

-

-src_compile() {

-	filter-flags '-fomit-frame-pointer'

-

-	local myconf

-	myconf=""

-

-	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"

-

-	econf ${myconf} \

-		$(use_with fam) \

-		$(use_with ipv6) \

-		$(use_with spell ispell) \

-		$(use_with ldap ldapaliasd) \

-		$(use_enable ldap maildroldap) \

-		$(use_with gnutls) \

-		--enable-mimetypes=/etc/mime.types \

-		--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}" 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}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}

-}

-

-src_install() {

-	local f

-	diropts -o mail -g mail

-	keepdir /var/lib/courier/tmp

-	keepdir /var/lib/courier/msgs

-	make install DESTDIR="${D}" || die "install"

-	make install-configure || die "install-configure"

-

-	# Get rid of files we dont want

-	if ! use webmail ; then

-		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \

-			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \

-			"${D}/usr/share/courier/sqwebmail/" \

-			"${D}/usr/sbin/webmaild" \

-			"${D}/usr/sbin/webgpg" \

-			"${D}/etc/courier/webmail.authpam" \

-			"${D}/var/lib/courier/webmail-logincache" \

-			"${D}"/etc/courier/sqwebmaild*

-	fi

-

-	if ! use web ; then

-		rm -rf "${D}/usr/share/courier/courierwebadmin/" \

-			"${D}/etc/courier/webadmin"

-	fi

-

-	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do

-		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"

-	done

-

-	newinitd "${FILESDIR}/courier-init-r4" "courier"

-	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"

-

-	cd "${D}/etc/courier"

-	if use webmail ; then

-		insinto /etc/courier

-		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc

-	fi

-

-	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done

-	if use ldap ; then

-		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )

-	else

-		rm -f ldapaliasrc

-	fi

-

-	( [ -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"

-

-	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"

-

-	# Fix for a sandbox violation on subsequential merges

-	# - ticho@gentoo.org, 2005-07-10

-	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

-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"

-

-	if use webmail ; then

-		insinto /usr/$(get_libdir)/courier/courier

-		insopts -m 755 -o mail -g mail

-		doins "${S}/courier/webmaild"

-	fi

-

-	if use web ; then

-		insinto /etc/courier/webadmin

-		insopts -m 400 -o mail -g mail

-		doins "${FILESDIR}/password.dist"

-	fi

-

-	# 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

-	if use web ; then

-		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"

-	fi

-

-	# users should be able to send mail. Could be restricted with suictl.

-	chmod u+s "${D}/usr/bin/sendmail"

-

-	dosym /usr/bin/sendmail /usr/sbin/sendmail

-}

-

-src_test() {

-	if [ `whoami` != 'root' ]; then

-		emake -j1 check || die "Make check failed."

-	else

-		einfo "make check skipped, can't run as root."

-		einfo "You can enable it with FEATURES=\"userpriv\""

-	fi

-}

-

-pkg_postinst() {

-	use fam && elog "fam daemon is needed for courier-imapd" \

-		|| ewarn "courier was built without fam support"

-}

-

-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

-}

@@ -1,14 +0,0 @@

-Alias /webmail/ /usr/share/courier/sqwebmail/images/

-<Directory /usr/share/courier/sqwebmail/>

-	Order Allow,Deny

-	AllowOverride All

-	Allow from all

-</Directory>

-

-ScriptAlias /courier/ /usr/lib/courier/courier/webmail/

-<Directory /usr/lib/courier/courier/webmail/>

-	AllowOverride All

-	Options ExecCGI

-	Order allow,deny

-	Allow from all

-</Directory>

@@ -1,115 +0,0 @@

-diff -Naur courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.am courier-0.73.2.20140911/courier/module.esmtp/Makefile.am

---- courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.am	2014-09-18 10:23:10.185497520 +0200

-+++ courier-0.73.2.20140911/courier/module.esmtp/Makefile.am	2014-09-18 10:23:28.515504964 +0200

-@@ -93,9 +93,9 @@

- 

- courieresmtpd_DEPENDENCIES=$(courieresmtp_DEPENDENCIES) \

- 				../../libs/tcpd/libspipe.la

--courieresmtpd_LDADD=$(commonLDADD) ../../libs/tcpd/libspipe.la

--courieresmtpd_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags` \

--		-lcourierauthsasl -lcourierauth

-+courieresmtpd_LDADD=$(commonLDADD) ../../libs/tcpd/libspipe.la \

-+			-lcourierauthsasl -lcourierauth

-+courieresmtpd_LDFLAGS=`@COURIERAUTHCONFIG@ --ldflags`

- 

- addcr_SOURCES=addcr.c

- 

-diff -Naur courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.in courier-0.73.2.20140911/courier/module.esmtp/Makefile.in

---- courier-0.73.2.20140911-vanilla/courier/module.esmtp/Makefile.in	2014-09-18 10:23:10.185497520 +0200

-+++ courier-0.73.2.20140911/courier/module.esmtp/Makefile.in	2014-09-18 10:23:28.515504964 +0200

-@@ -462,9 +462,9 @@

- courieresmtpd_DEPENDENCIES = $(courieresmtp_DEPENDENCIES) \

- 				../../libs/tcpd/libspipe.la

- 

--courieresmtpd_LDADD = $(commonLDADD) ../../libs/tcpd/libspipe.la

--courieresmtpd_LDFLAGS = `@COURIERAUTHCONFIG@ --ldflags` \

--		-lcourierauthsasl -lcourierauth

-+courieresmtpd_LDADD = $(commonLDADD) ../../libs/tcpd/libspipe.la \

-+			-lcourierauthsasl -lcourierauth

-+courieresmtpd_LDFLAGS = `@COURIERAUTHCONFIG@ --ldflags`

- 

- addcr_SOURCES = addcr.c

- librewrite_la_SOURCES = esmtp.c

-diff -Naur courier-0.73.2.20140911-vanilla/libs/gpglib/Makefile.in courier-0.73.2.20140911/libs/gpglib/Makefile.in

---- courier-0.73.2.20140911-vanilla/libs/gpglib/Makefile.in	2014-09-18 10:23:10.245497543 +0200

-+++ courier-0.73.2.20140911/libs/gpglib/Makefile.in	2014-09-18 10:23:22.385502476 +0200

-@@ -333,9 +333,9 @@

- 	sign.c tempname.c tempname.h

- 

- testgpg_SOURCES = testgpg.c

--testgpg_LDADD = libgpg.la ../numlib/libnumlib.la

-+testgpg_LDADD = libgpg.la ../numlib/libnumlib.la -lunicode

- testgpg_DEPENDENCIES = $(testgpg_LDADD)

--testgpg_LDFLAGS = -static -lunicode

-+testgpg_LDFLAGS = -static

- mimegpg_SOURCES = mimegpg.c

- mimegpg_LDADD = libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \

- 		../rfc822/libencode.la ../numlib/libnumlib.la \

-diff -Naur courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.am courier-0.73.2.20140911/libs/rfc2045/Makefile.am

---- courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.am	2014-09-18 10:23:10.225497535 +0200

-+++ courier-0.73.2.20140911/libs/rfc2045/Makefile.am	2014-09-18 10:23:22.385502476 +0200

-@@ -31,24 +31,23 @@

- 

- reformime_SOURCES=reformime.c

- reformime_LDADD = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \

--		../numlib/libnumlib.la

-+		../numlib/libnumlib.la -lunicode

- reformime_DEPENDENCIES = $(reformime_LDADD)

--reformime_LDFLAGS=-static -lunicode

-+reformime_LDFLAGS=-static

- 

- makemime_SOURCES=makemime.c

--makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la

-+makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -lunicode

- makemime_DEPENDENCIES=$(makemime_LDADD)

--makemime_LDFLAGS=-static -lunicode

-+makemime_LDFLAGS=-static

- 

- headercheck_SOURCES=headercheck.c

--headercheck_LDADD=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la

-+headercheck_LDADD=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la -lunicode

- headercheck_DEPENDENCIES=$(headercheck_LDADD)

--headercheck_LDFLAGS=-static -lunicode

-+headercheck_LDFLAGS=-static

- 

- testrfc3676parser_SOURCES=testrfc3676parser.c

--testrfc3676parser_LDADD=librfc2045.la

-+testrfc3676parser_LDADD=librfc2045.la -lunicode

- testrfc3676parser_DEPENDENCIES=$(testrfc3676parser_LDADD)

--testrfc3676parser_LDFLAGS=-lunicode

- 

- if HAVE_SGML

- reformime.html: reformime.sgml ../docbook/sgml2html

-diff -Naur courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.in courier-0.73.2.20140911/libs/rfc2045/Makefile.in

---- courier-0.73.2.20140911-vanilla/libs/rfc2045/Makefile.in	2014-09-18 10:23:10.225497535 +0200

-+++ courier-0.73.2.20140911/libs/rfc2045/Makefile.in	2014-09-18 10:23:22.385502476 +0200

-@@ -395,22 +395,21 @@

- 

- reformime_SOURCES = reformime.c

- reformime_LDADD = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \

--		../numlib/libnumlib.la

-+		../numlib/libnumlib.la -lunicode

- 

- reformime_DEPENDENCIES = $(reformime_LDADD)

--reformime_LDFLAGS = -static -lunicode

-+reformime_LDFLAGS = -static

- makemime_SOURCES = makemime.c

--makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la

-+makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -lunicode

- makemime_DEPENDENCIES = $(makemime_LDADD)

--makemime_LDFLAGS = -static -lunicode

-+makemime_LDFLAGS = -static

- headercheck_SOURCES = headercheck.c

--headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la

-+headercheck_LDADD = librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la -lunicode

- headercheck_DEPENDENCIES = $(headercheck_LDADD)

--headercheck_LDFLAGS = -static -lunicode

-+headercheck_LDFLAGS = -static

- testrfc3676parser_SOURCES = testrfc3676parser.c

--testrfc3676parser_LDADD = librfc2045.la

-+testrfc3676parser_LDADD = librfc2045.la -lunicode

- testrfc3676parser_DEPENDENCIES = $(testrfc3676parser_LDADD)

--testrfc3676parser_LDFLAGS = -lunicode

- @HAVE_LIBIDN_FALSE@TESTSUITE = testsuite.txt.noidn

- @HAVE_LIBIDN_TRUE@TESTSUITE = testsuite.txt.idn

- all: $(BUILT_SOURCES) rfc2045_config.h

@@ -1,190 +0,0 @@

-#!/sbin/runscript

-# Portions Copyright 2003 Gentoo Linux

-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/files/courier-init-r4,v 1.3 2013/10/18 13:21:14 hanno Exp $

-#

-# script originally from Courier distfile original name = courier.sysvinit

-# adapted for Gentoo by Brian Jackson

-#

-# TODO

-# should we update all the .dat/.pem files when the source/config files are 

-#	newer than the .dat/.pem files?

-

-prefix="/usr"

-exec_prefix="/usr/bin"

-sysconfdir="/etc/courier"

-sbindir="/usr/sbin"

-libexecdir="/usr/lib/courier"

-datadir="/usr/share/courier"

-

-depend() {

-	need net

-	[ -d /etc/courier/authlib ] && need courier-authlib

-	grep -q "^IMAPDSTART=.*[Yy].*" /etc/courier/imapd && use famd

-	grep -q "^IMAPDSSLSTART=.*[Yy].*" /etc/courier/imapd-ssl && use famd

-}

-

-checkconfig() {

-	checkpath -q -d -o mail:mail -m 0755 /var/run/courier

-

-	[ -f ${sysconfdir}/pop3d-ssl ] && . ${sysconfdir}/pop3d-ssl

-

-	# If we do not have a certificate, make one up.

-	[ ! -f "${datadir}/pop3d.pem" ] && \

-	ebegin " generating-POP3-SSL-certificate..." && "${sbindir}/mkpop3dcert"

-

-	[ -f ${sysconfdir}/imapd-ssl ] && . ${sysconfdir}/imapd-ssl

-

-	# If we do not have a certificate, make one up.

-	[ ! -f ${datadir}/imapd.pem ] && \

-	ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert"

-

-	[ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl

-

-	# If we do not have a certificate, make one up.

-	[ ! -f ${datadir}/esmtpd.pem ] && \

-	ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert"

-

-	# First time after install create aliases.dat and smtpaccess.dat

-

-	[ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases

-

-	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess

-

-	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa

-}

-

-start() {

-	# Start daemons.

-	ebegin "Starting Courier mail server:"

-

-	checkconfig || return 1

-

-	ebegin " Starting courierfilterd"

-	${sbindir}/courierfilter start

-

-	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \

-	${libexecdir}/authlib/authdaemond start && ebegin " Starting authdaemond"

-

-	[ -x ${sbindir}/webmaild ] && \

-	  ${sbindir}/webmaild start && ebegin " Starting webmaild" 

-

-	[ -x ${sbindir}/courierldapaliasd ] && \

-	${sbindir}/courierldapaliasd start && ebegin " Starting courierldapaliasd"

-

-	ebegin " Starting courierd"

-	${sbindir}/courier start

-

-	savepath="$PATH"

-	# start esmtpd if so written

-	[ -f ${sysconfdir}/esmtpd ] && source ${sysconfdir}/esmtpd

-	PATH="$savepath"

-	case x$ESMTPDSTART in

-	x[yY]*)

-		ebegin " Starting esmtpd"

-		${sbindir}/esmtpd start

-		;;

-	esac

-

-	# start esmtpd-msa if so written

-	[ -f ${sysconfdir}/esmtpd-msa ] && source ${sysconfdir}/esmtpd-msa

-	PATH="$savepath"

-	case x$ESMTPDSTART in

-	x[yY]*)

-		ebegin " Starting esmtpd-msa"

-		${sbindir}/esmtpd-msa start

-		;;

-	esac

-

-	# start esmtpd-ssl if so written

-	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl

-	PATH="$savepath"

-	case x$ESMTPDSSLSTART in

-	x[yY]*)

-		ebegin " Starting esmtpd-ssl"

-		${sbindir}/esmtpd-ssl start

-		;;

-	esac

-

-	# start pop3d if so written

-	[ -f ${sysconfdir}/pop3d ] && source ${sysconfdir}/pop3d

-	PATH="$savepath"

-	case x$POP3DSTART in

-	x[yY]*)

-		ebegin " courier-pop3d"

-		${sbindir}/courier-pop3d start

-		;;

-	esac

-

-	# start pop3d-ssl if so written

-	[ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl

-	PATH="$savepath"

-	case x$POP3DSSLSTART in

-	x[yY]*)

-		ebegin " courier-pop3d-ssl"

-		${sbindir}/courier-pop3d-ssl start

-		;;

-	esac

-

-	[ -f ${sysconfdir}/imapd ] && source ${sysconfdir}/imapd

-	PATH="$savepath"

-	case x$IMAPDSTART in

-	x[yY]*)

-		ebegin " courier-imapd"

-		${sbindir}/courier-imapd start

-		;;

-	esac

-

-	[ -f ${sysconfdir}/imapd-ssl ] && source ${sysconfdir}/imapd-ssl

-	PATH="$savepath"

-	case x$IMAPDSSLSTART in

-	x[yY]*)

-		ebegin " courier-imapd-ssl"

-		${sbindir}/courier-imapd-ssl start

-		;;

-	esac

-

-	eend $?

-}

-

-stop() {

-	ebegin "Stopping Courier mail server:"

-

-	ebegin " Stopping courier-esmtpd"

-	${sbindir}/esmtpd stop

-

-	ebegin " Stopping courier-esmtpd-msa"

-	${sbindir}/esmtpd-msa stop

-

-	ebegin " Stopping courier-esmtpd-ssl"

-	${sbindir}/esmtpd-ssl stop

-

-	[ -x ${sbindir}/courier-pop3d ] && \

-		ebegin " Stopping courier-pop3d" && ${sbindir}/courier-pop3d stop

-

-	[ -x ${sbindir}/courier-pop3d-ssl ] && \

-		ebegin " Stopping courier-pop3d-ssl" && ${sbindir}/courier-pop3d-ssl stop

-

-	[ -x ${sbindir}/courier-imapd ] && \

-		ebegin " Stopping courier-imapd" && ${sbindir}/courier-imapd stop

-

-

-	[ -x ${sbindir}/courier-imapd-ssl ] && \

-		ebegin " Stopping courier-imapd-ssl" && ${sbindir}/courier-imapd-ssl stop

-

-	ebegin " Stopping courierd"

-	${sbindir}/courier stop

-

-	[ -x ${sbindir}/courierldapaliasd ] && \

-	( ${sbindir}/courierldapaliasd stop ; ebegin " Stopping courierldapaliasd" )

-

-	[ -x ${sbindir}/webmaild ] && \

-	  ( ${sbindir}/webmaild stop ; ebegin " Stopping webmaild" )

-

-	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \

-	( ${libexecdir}/authlib/authdaemond stop ; ebegin " Stopping authdaemond" )

-

-	${sbindir}/courierfilter stop

-	ebegin " Stopping courierfilterd"

-

-	eend $?

-}

@@ -1,21 +0,0 @@

---- courier/module.esmtp/esmtp.c.orig	2004-02-03 01:08:15.679486558 -0700

-+++ courier/module.esmtp/esmtp.c	2004-02-03 01:07:41.262697092 -0700

-@@ -255,6 +255,10 @@ const char *me;

- struct rfc822t	*tp;

- struct rfc822token at;

- 

-+#if 1

-+	(*func)(info);

-+	return;

-+#else

- 	if (info->ptr == 0)

- 	{

- 		(*func)(info);

-@@ -289,6 +293,7 @@ struct rfc822token at;

- 	(*func)(info);

- 	*r=0;

- 	rfc822t_free(tp);

-+#endif

- }

- 

- static void rw_esmtp(struct rw_info *info, void (*func)(struct rw_info *))

@@ -1,6 +0,0 @@

-# 1. Open /etc/courier/webadmin/password for editing

-# 2. There should be one word in this file.  The webadmin password

-# 3. chown mail:mail password

-# 4. chmod 400 password

-#

-# Thanks to Fernando Tobler on bug #10574 for the concise instructions