diff options
author | Hanno Boeck <hanno@gentoo.org> | 2010-06-28 12:09:41 +0000 |
---|---|---|
committer | Hanno Boeck <hanno@gentoo.org> | 2010-06-28 12:09:41 +0000 |
commit | d245abbf4566f8a23a3d404256288ddcac884bfa (patch) | |
tree | 5326d68737fc8670e09c611ac7b6fb258948a9c5 /mail-mta | |
parent | Stable on amd64 wrt bug #325931 (diff) | |
download | historical-d245abbf4566f8a23a3d404256288ddcac884bfa.tar.gz historical-d245abbf4566f8a23a3d404256288ddcac884bfa.tar.bz2 historical-d245abbf4566f8a23a3d404256288ddcac884bfa.zip |
courier bump
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'mail-mta')
-rw-r--r-- | mail-mta/courier/ChangeLog | 7 | ||||
-rw-r--r-- | mail-mta/courier/Manifest | 14 | ||||
-rw-r--r-- | mail-mta/courier/courier-0.65.0.ebuild | 298 |
3 files changed, 317 insertions, 2 deletions
diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog index b73bead03ae0..276cd72b10f0 100644 --- a/mail-mta/courier/ChangeLog +++ b/mail-mta/courier/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/courier # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.128 2010/06/17 20:24:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.129 2010/06/28 12:09:41 hanno Exp $ + +*courier-0.65.0 (28 Jun 2010) + + 28 Jun 2010; Hanno Boeck <hanno@gentoo.org> +courier-0.65.0.ebuild: + Version bump. 17 Jun 2010; Patrick Lauer <patrick@gentoo.org> courier-0.59.0.ebuild, courier-0.60.0.ebuild, courier-0.61.1.ebuild, courier-0.61.2.ebuild, diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest index 4c12b9365b6e..72fcfc02b194 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 AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33ca79921961b223cbdf394d9549 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c AUX courier-0.59.0-asneeded.patch 534 RMD160 fe2f28235842220d999dc77ed22857dd99c648a2 SHA1 5ae8a8cefbbd91f2146988c9095ac0e3668c1135 SHA256 802ae0431c9d2b55cdda4602522058874765170d12f4e2fcdd064971f8d31991 @@ -18,6 +21,7 @@ DIST courier-0.62.2.tar.bz2 7132042 RMD160 787b0240a0683350d0d1d7fc5220505d82579 DIST courier-0.63.0.tar.bz2 7133009 RMD160 bb47bf049c831756b5352ad1df5f7f4a67a8d52b SHA1 79d8b3b2e4cdcc07cc54308bac689255816ef9e6 SHA256 3a52363605f75f4156105aefa6bd375626f742033fbf09b5592179f274322044 DIST courier-0.64.0.tar.bz2 7136191 RMD160 b38563ec054110068d1b2f6399bdb6539ec272a0 SHA1 921d69f2235be7fd548b9082abdaf0cc18e84223 SHA256 9e72165a6c369d135a128af7e69afa3cfa7be608f8f75049b517a077524aa9cc DIST courier-0.64.1.tar.bz2 7131375 RMD160 f7a0733ab2c4f8e0743bbe8b0fb4c44a5d75ceec SHA1 c8b81a2deb87ce07c74033fae807a498e4958e52 SHA256 b1cc5d95b256b7467743bcd78536c952febe3bfd7926fcc51742bf105deaadee +DIST courier-0.65.0.tar.bz2 7099997 RMD160 e5fc4742da27b3b97bd2592ad3ecc96618abada3 SHA1 4e5b7e64a35fe886a59621bc87e7f111428f19bc SHA256 ad0327eecbd231379a59e728cd27fd45db0e96faabca8920896ed77327d77604 EBUILD courier-0.59.0.ebuild 10184 RMD160 a34fc8a5137ee1150bb0b106a621571716b96984 SHA1 c099b316a8f368460832b61feef205e2790eabf6 SHA256 552ea8f7f1e1726b849df1b5816b0a90d195af0710252afc7aa80823c6a3cd6e EBUILD courier-0.60.0.ebuild 10060 RMD160 3507f1b569e752f117377298896726a1e9ea3471 SHA1 2c075860226331424e3a74263f8d5a10e76a2360 SHA256 17eff7cf823cc0758321f9e2219e0e325306303553e9a346309c3f67a2a1233e EBUILD courier-0.61.1.ebuild 9860 RMD160 7c51ec43f0b53ad6227cf291dae94a82eb22604d SHA1 48cacaa5df46a18a798b0f2b517d37ac9865a974 SHA256 fc7a22acbd3407b24bbac7c01cbeda00e5b62df5166eb56efdb9bc5d0778ad9a @@ -26,5 +30,13 @@ EBUILD courier-0.62.2.ebuild 9286 RMD160 35e2510ab403e0984a7474b9f77652057024311 EBUILD courier-0.63.0.ebuild 9292 RMD160 02686998b130906c22ca548038221a8ea644c8da SHA1 0de4e24626bf7ef6eab52de57faae05ee8a2337b SHA256 5d9afdf0bd80228112eac659a4e4b54437694e4d38bd0315105ffcdb3a4460d9 EBUILD courier-0.64.0.ebuild 9292 RMD160 acc1f78b87b3392b088a03f8ab28ac94ab66b50b SHA1 84c4b66b034397262d0189e890f4affba31b5f9a SHA256 4d1fe78ce374b7f6255f1405842d527d659f84e9f3af60df41b5183b97cf4797 EBUILD courier-0.64.1.ebuild 9291 RMD160 ba2d7943886ed6dd4d69a3d5381cafc544f4f536 SHA1 afa0a1e905b930b190bf345bf95bd43587f2bea1 SHA256 28d3285ea84ae671e220ac7f020d7ec8be548cb67407da30077f838555f761c2 -MISC ChangeLog 31921 RMD160 93129108870e479645781d25ea969dc5d97a4fbe SHA1 28213b14153de05d1b0c8a30cf5dc6474970794e SHA256 ff8ae0d24d55ed33dcb921b6d88faa5f17c5f3c2883a83a050341dd8b5e88aed +EBUILD courier-0.65.0.ebuild 9290 RMD160 c56749c8804ae6c13ddc5401cfe1a1b9f573cade SHA1 ca70207f795c72620bf0b85500aab26637f426c4 SHA256 24f74847cfd374c4ac7e45887518c113754732c5e7c8770ee0831b35955037d4 +MISC ChangeLog 32037 RMD160 baa36ec32b1a770d07f3517eafc91255537a6fc8 SHA1 8f49cccfe32ad61fc4d65f9077405a32f42d8520 SHA256 8cb5b143457e0bd1663cf7a4575e491af74d31974bb19491de782da15dc7ffef MISC metadata.xml 687 RMD160 753323e40a9add2b07fd1f138c672ce283d2f255 SHA1 2e8255902a9e0394bd27e13e488e84ba70f05845 SHA256 ea417e66d396e793212529ed20f5570b0c97eb666a5ba52bb3202bbfbc022be1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwokQsACgkQr2QksT29OyCxjACfZif0b6/3/kRGCwa8li446Yoh +O64AoKAjWI4Am952VaeC84ZJAPiU/iex +=xMfs +-----END PGP SIGNATURE----- diff --git a/mail-mta/courier/courier-0.65.0.ebuild b/mail-mta/courier/courier-0.65.0.ebuild new file mode 100644 index 000000000000..726d89ebcad5 --- /dev/null +++ b/mail-mta/courier/courier-0.65.0.ebuild @@ -0,0 +1,298 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.0.ebuild,v 1.1 2010/06/28 12:09:41 hanno Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="An MTA designed specifically for maildirs" +SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" +HOMEPAGE="http://www.courier-mta.org/" +SLOT="0" +LICENSE="GPL-2" +# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64 ~mips +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" +IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \ + fam web webmail" + +PROVIDE="virtual/mta + virtual/mda + virtual/imapd" + +DEPEND=" + >=net-libs/courier-authlib-0.61.0 + >=dev-libs/openssl-0.9.6 + >=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? ( 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 )" + +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) \ + --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/run/courier + 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 + cd "${D}" + cat "${FILESDIR}/webmail_files" | xargs rm -rf + fi + + if ! use web ; then + cd "${D}" + cat "${FILESDIR}/webadmin_files" | xargs rm -rf + 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-r2" "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 + 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 + mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${P}/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" + + 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" + + insopts -m 444 -o mail -g mail + insinto /etc/mail + doins "${FILESDIR}/mailer.conf" + else + dosym /usr/bin/sendmail /usr/sbin/sendmail + fi +} + +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 +} |