From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MWwjr-0003BS-Al for garchives@archives.gentoo.org; Fri, 31 Jul 2009 18:21:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE4DCE0730; Fri, 31 Jul 2009 18:21:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7F777E0730 for ; Fri, 31 Jul 2009 18:21:54 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 2449266CC2 for ; Fri, 31 Jul 2009 18:21:54 +0000 (UTC) Received: from hanno by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MWwjp-000878-Lg for gentoo-commits@lists.gentoo.org; Fri, 31 Jul 2009 18:21:53 +0000 From: "Hanno Boeck (hanno)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hanno@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in mail-mta/courier: ChangeLog courier-0.62.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog courier-0.62.2.ebuild X-VCS-Directories: mail-mta/courier X-VCS-Committer: hanno X-VCS-Committer-Name: Hanno Boeck Content-Type: text/plain; charset=utf8 Message-Id: Sender: Hanno Boeck Date: Fri, 31 Jul 2009 18:21:53 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6abb19c0-871d-4837-b5d2-2a0d39df5e91 X-Archives-Hash: 6cd7ffff14b141a43ee16a97e929dc34 hanno 09/07/31 18:21:53 Modified: ChangeLog Added: courier-0.62.2.ebuild Log: courier bump (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.118 mail-mta/courier/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/C= hangeLog?rev=3D1.118&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/C= hangeLog?rev=3D1.118&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/C= hangeLog?r1=3D1.117&r2=3D1.118 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- ChangeLog 4 May 2009 17:16:23 -0000 1.117 +++ ChangeLog 31 Jul 2009 18:21:53 -0000 1.118 @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/courier # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.117 20= 09/05/04 17:16:23 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.118 20= 09/07/31 18:21:53 hanno Exp $ + +*courier-0.62.2 (31 Jul 2009) + + 31 Jul 2009; Hanno Boeck +courier-0.62.2.ebuild: + Version bump, some cleanup, get rid of checking FEATURES variable. =20 04 May 2009; Hanno Boeck courier-0.61.2.ebuild: Don't redundantly set S and don't call filter-flags in global scope. 1.1 mail-mta/courier/courier-0.62.2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/c= ourier-0.62.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/courier/c= ourier-0.62.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: courier-0.62.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.62.2.ebuild= ,v 1.1 2009/07/31 18:21:53 hanno Exp $ inherit eutils flag-o-matic DESCRIPTION=3D"An MTA designed specifically for maildirs" SRC_URI=3D"mirror://sourceforge/courier/${P}.tar.bz2" HOMEPAGE=3D"http://www.courier-mta.org/" SLOT=3D"0" LICENSE=3D"GPL-2" # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64 ~mips KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" IUSE=3D"postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwr= apper \ fam web webmail" PROVIDE=3D"virtual/mta virtual/mda virtual/imapd" DEPEND=3D" >=3Dnet-libs/courier-authlib-0.61.0 >=3Ddev-libs/openssl-0.9.6 >=3Dsys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=3Dmedia-libs/netpbm-9.12 virtual/ghostscript >=3Dnet-dialup/mge= tty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=3Dnet-nds/openldap-1.2.11 ) postgres? ( virtual/postgresql-base ) spell? ( virtual/aspell-dict ) fam? ( virtual/fam ) !mailwrapper? ( !virtual/mta ) !virtual/imapd !mail-filter/maildrop" RDEPEND=3D"${DEPEND} dev-lang/perl sys-process/procps" PDEPEND=3D"mailwrapper? ( >=3Dnet-mail/mailwrapper-0.2 ) pam? ( net-mail/mailbase ) crypt? ( >=3Dapp-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=3D"" use ldap && myconf=3D"${myconf} --with-ldapconfig=3D/etc/courier/maildro= pldap.conf" econf ${myconf} \ $(use_with fam) \ $(use_with ipv6) \ $(use_with spell ispell) \ $(use_with ldap ldapaliasd) \ $(use_enable ldap maildroldap) \ --enable-mimetypes=3D/etc/mime.types \ --prefix=3D/usr \ --disable-root-check \ --mandir=3D/usr/share/man \ --sysconfdir=3D/etc/courier \ --libexecdir=3D/usr/$(get_libdir)/courier \ --datadir=3D/usr/share/courier \ --sharedstatedir=3D/var/lib/courier/com \ --localstatedir=3D/var/lib/courier \ --with-piddir=3D/var/run/courier \ --with-authdaemonvar=3D/var/lib/courier/authdaemon \ --with-mailuser=3Dmail \ --with-mailgroup=3Dmail \ --with-paranoid-smtpext \ --with-db=3Dgdbm \ --disable-autorenamesent \ --cache-file=3D"${S}/configuring.cache" \ --host=3D"${CHOST}" debug=3Dtrue || 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=3D"${1}" ; word=3D"`echo \"${2}\" | sed -e\"s|=3D.*$||\" -e\"s|^.*o= pt ||\"`" [ ! -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=3D"${1}" ; key=3D"${2}" ; value=3D"${3}" ; section=3D"${4}" [ -z "${section}" ] && section=3D"${2}" grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}= " sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=3D.*|${key}=3D\"${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=3D"${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 ldapalias= rc ) 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=3Daccept" etc_courier bofh "opt BOFHSPFTRUSTME=3D1" etc_courier bofh "opt BOFHSPFHELO=3Dpass,neutral,unknown,none,error,soft= fail,fail" etc_courier bofh "opt BOFHSPFHELO=3Dpass,neutral,unknown,none" etc_courier bofh "opt BOFHSPFFROM=3Dall" etc_courier bofh "opt BOFHSPFMAILFROM=3Dall" etc_courier bofh "#opt BOFHSPFHARDERROR=3Dfail" etc_courier esmtpd "BOFHBADMIME=3Daccept" etc_courier esmtpd-ssl "BOFHBADMIME=3Daccept" etc_courier esmtpd-msa "BOFHBADMIME=3Daccept" use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHIL= DREN NAMESPACE THREAD=3DORDEREDSUBJECT THREAD=3DREFERENCES SORT QUOTA AUT= H=3DCRAM-MD5 AUTH=3DCRAM-SHA1 AUTH=3DCRAM-SHA256 IDLE" use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHIL= DREN NAMESPACE THREAD=3DORDEREDSUBJECT THREAD=3DREFERENCES SORT QUOTA AUT= H=3DCRAM-MD5 AUTH=3DCRAM-SHA1 AUTH=3DCRAM-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 c= ourier/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` !=3D '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=3D\"userpriv\"" fi } pkg_postinst() { use fam && elog "fam daemon is needed for courier-imapd" \ || ewarn "courier was built without fam support" } pkg_config() { mailhost=3D"$(hostname)" export mailhost domainname=3D"$(domainname)" if [ "x$domainname" =3D "x(none)" ] ; then domainname=3D"$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")" fi export domainname if [ "${ROOT}" =3D "/" ] ; then file=3D"${ROOT}/etc/courier/locals" if [ ! -f "${file}" ] ; then echo "localhost" > "${file}"; echo "${domainname}" >> "${file}"; fi file=3D"${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}" if [ ! -f "${file}" ] ; then echo "${domainname}" > "${file}" /usr/sbin/makeacceptmailfor fi file=3D"${ROOT}/etc/courier/smtpaccess/${domainname}" if [ ! -f "${file}" ] then netstat -nr | grep "^[1-9]" | while read network gateway netmask rest do i=3D1 net=3D"" TIFS=3D"${IFS}" IFS=3D"." for o in "${netmask}" do if [ "${o}" =3D=3D "255" ] then [ "_${net}" =3D=3D "_" ] || net=3D"${net}." t=3D"$(echo "${network}" | cut -d " " -f ${i})" net=3D"${net}${t}" fi i=3D"$((${i} + 1))" done IFS=3D"${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 }