From 0231d150b0986cb183dfb7eec04170576f6269dc Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 24 Jan 2011 07:20:42 +0000 Subject: Revbump to add sqlite USE flag (bug #352405 by Andreis_Vinogradovs) and remove old. (Portage version: 2.2.0_alpha19/cvs/Linux x86_64) --- mail-mta/postfix/ChangeLog | 9 +- mail-mta/postfix/postfix-2.8.0-r1.ebuild | 259 +++++++++++++++++++++++++++++++ mail-mta/postfix/postfix-2.8.0.ebuild | 253 ------------------------------ 3 files changed, 267 insertions(+), 254 deletions(-) create mode 100644 mail-mta/postfix/postfix-2.8.0-r1.ebuild delete mode 100644 mail-mta/postfix/postfix-2.8.0.ebuild (limited to 'mail-mta/postfix') diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog index 2b062b1ae7fe..065a4ab4e2e6 100644 --- a/mail-mta/postfix/ChangeLog +++ b/mail-mta/postfix/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-mta/postfix # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.227 2011/01/22 18:43:45 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.228 2011/01/24 07:20:42 radhermit Exp $ + +*postfix-2.8.0-r1 (24 Jan 2011) + + 24 Jan 2011; Tim Harder -postfix-2.8.0.ebuild, + +postfix-2.8.0-r1.ebuild: + Revbump to add sqlite USE flag (bug #352405 by Andreis_Vinogradovs) and + remove old. 22 Jan 2011; Kacper Kowalik postfix-2.7.1.ebuild: ppc/ppc64 stable wrt #343313 diff --git a/mail-mta/postfix/postfix-2.8.0-r1.ebuild b/mail-mta/postfix/postfix-2.8.0-r1.ebuild new file mode 100644 index 000000000000..7f0aa8a2d914 --- /dev/null +++ b/mail-mta/postfix/postfix-2.8.0-r1.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.8.0-r1.ebuild,v 1.1 2011/01/24 07:20:42 radhermit Exp $ + +EAPI=3 + +inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam + +MY_PV="${PV/_rc/-RC}" +MY_SRC="${PN}-${MY_PV}" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" +VDA_PV="2.7.1" +VDA_P="${PN}-vda-${VDA_PV}" +RC_VER="2.5" + +DESCRIPTION="A fast and secure drop-in replacement for sendmail." +HOMEPAGE="http://www.postfix.org/" +SRC_URI="${MY_URI}/${MY_SRC}.tar.gz + vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) " + +LICENSE="IBM" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux sqlite ssl vda" + +PROVIDE="virtual/mta virtual/mda" + +DEPEND=">=sys-libs/db-3.2 + >=dev-libs/libpcre-3.4 + cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) + ldap? ( >=net-nds/openldap-1.2 ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql-base ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( >=dev-libs/openssl-0.9.6g )" + +RDEPEND="${DEPEND} + net-mail/mailbase + !virtual/mta + !net-mail/mailwrapper + selinux? ( sec-policy/selinux-postfix )" + +S="${WORKDIR}/${MY_SRC}" + +group_user_check() { + einfo "Checking for postfix group ..." + enewgroup postfix 207 + einfo "Checking for postdrop group ..." + enewgroup postdrop 208 + einfo "Checking for postfix user ..." + enewuser postfix 207 -1 /var/spool/postfix postfix,mail +} + +pkg_setup() { + # Add postfix, postdrop user/group (bug #77565) + group_user_check || die "Failed to check/add needed user/group" +} + +src_prepare() { + if use vda ; then + epatch "${DISTDIR}/${VDA_P}.patch" + fi + + sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ + src/util/sys_defs.h || die "sed failed" + + # change default paths to better comply with portage standard paths + sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" +} + +src_configure() { + # Make sure LDFLAGS get passed down to the executables. + local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread" + + use pam && mylibs="${mylibs} -lpam" + + if use ldap ; then + mycc="${mycc} -DHAS_LDAP" + mylibs="${mylibs} -lldap -llber" + fi + + if use mysql ; then + mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)" + mylibs="${mylibs} -lmysqlclient -lm -lz" + fi + + if use postgres ; then + mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)" + mylibs="${mylibs} -lpq -L$(pg_config --libdir)" + fi + + if use sqlite ; then + mycc="${mycc} -DHAS_SQLITE" + mylibs="${mylibs} -lsqlite3" + fi + + if use ssl ; then + mycc="${mycc} -DUSE_TLS" + mylibs="${mylibs} -lssl -lcrypto" + fi + + if use sasl ; then + if use dovecot-sasl ; then + # Set dovecot as default. + mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\"" + fi + mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" + mylibs="${mylibs} -lsasl2" + elif use dovecot-sasl ; then + mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" + fi + + if ! use nis ; then + sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \ + src/util/sys_defs.h || die "sed failed" + fi + + if use cdb ; then + mycc="${mycc} -DHAS_CDB -I/usr/include/cdb" + CDB_LIBS="" + + # Tinycdb is preferred. + if has_version dev-db/tinycdb ; then + einfo "Building with dev-db/tinycdb" + CDB_LIBS="-lcdb" + else + einfo "Building with dev-db/cdb" + CDB_PATH="/usr/$(get_libdir)" + for i in cdb.a alloc.a buffer.a unix.a byte.a ; do + CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}" + done + fi + + mylibs="${mylibs} ${CDB_LIBS}" + fi + + mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\"" + mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\"" + mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\"" + mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\"" + + # Robin H. Johnson 17/Nov/2006 + # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check. + mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" + filter-lfs-flags + + local my_cc=$(tc-getCC) + einfo "CC=${my_cc:=gcc}" + + # Workaround for bug #76512 + if use hardened ; then + [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os + fi + + emake DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ + makefiles || die "configure problem" +} + +src_install () { + /bin/sh postfix-install \ + -non-interactive \ + install_root="${D}" \ + config_directory="/usr/share/doc/${PF}/defaults" \ + readme_directory="/usr/share/doc/${PF}/readme" \ + || die "postfix-install failed" + + # Fix spool removal on upgrade + rm -Rf "${D}/var" + keepdir /var/spool/postfix + + # Install rmail for UUCP, closes bug #19127 + dobin auxiliary/rmail/rmail + + # Provide another link for legacy FSH + dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail + + # Install qshape tool + dobin auxiliary/qshape/qshape.pl + doman man/man1/qshape.1 + + # Performance tuning tools and their manuals + dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink} + doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1 + + # Set proper permissions on required files/directories + dodir /var/lib/postfix + keepdir /var/lib/postfix + fowners postfix:postfix /var/lib/postfix + fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT} + fperms 0750 /var/lib/postfix + fowners root:postdrop /usr/sbin/post{drop,queue} + fperms 02711 /usr/sbin/post{drop,queue} + + keepdir /etc/postfix + mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix + if use mbox ; then + mypostconf="mail_spool_directory=/var/spool/mail" + else + mypostconf="home_mailbox=.maildir/" + fi + "${D}/usr/sbin/postconf" -c "${D}/etc/postfix" \ + -e ${mypostconf} || die "postconf failed" + + insinto /etc/postfix + newins "${FILESDIR}/smtp.pass" saslpass + fperms 600 /etc/postfix/saslpass + + newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed" + + mv "${S}/examples" "${D}/usr/share/doc/${PF}/" + dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES* + dohtml html/* + + pamd_mimic_system smtp auth account + + if use sasl ; then + insinto /etc/sasl2 + newins "${FILESDIR}/smtp.sasl" smtpd.conf + fi +} + +pkg_postinst() { + # Add postfix, postdrop user/group (bug #77565) + group_user_check || die "Failed to check/add needed user/group" + + # Do not install server.{key,pem) SSL certificates if they already exist + if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \ + && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" + install_cert /etc/ssl/postfix/server + chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem} + fi + + ebegin "Fixing queue directories and permissions" + "${ROOT}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \ + daemon_directory=${ROOT}/usr/$(get_libdir)/postfix + echo + + if [[ ! -e /etc/mail/aliases.db ]] ; then + echo + ewarn "You must edit /etc/mail/aliases to suit your needs" + ewarn "and then run /usr/bin/newaliases. Postfix will not" + ewarn "work correctly without it." + fi + + if [[ -e /etc/mailer.conf ]] ; then + einfo + einfo "mailwrapper support is discontinued." + einfo "You may want to 'emerge -C mailwrapper' now." + einfo + fi + + elog + elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}" + elog "for incompatibilities and other major changes between releases." + elog +} diff --git a/mail-mta/postfix/postfix-2.8.0.ebuild b/mail-mta/postfix/postfix-2.8.0.ebuild deleted file mode 100644 index 8468411410a5..000000000000 --- a/mail-mta/postfix/postfix-2.8.0.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.8.0.ebuild,v 1.1 2011/01/21 18:32:41 radhermit Exp $ - -EAPI=3 - -inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam - -MY_PV="${PV/_rc/-RC}" -MY_SRC="${PN}-${MY_PV}" -MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" -VDA_PV="2.7.1" -VDA_P="${PN}-vda-${VDA_PV}" -RC_VER="2.5" - -DESCRIPTION="A fast and secure drop-in replacement for sendmail." -HOMEPAGE="http://www.postfix.org/" -SRC_URI="${MY_URI}/${MY_SRC}.tar.gz - vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) " - -LICENSE="IBM" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda" - -PROVIDE="virtual/mta virtual/mda" - -DEPEND=">=sys-libs/db-3.2 - >=dev-libs/libpcre-3.4 - cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) ) - ldap? ( >=net-nds/openldap-1.2 ) - mysql? ( virtual/mysql ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql-base ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ssl? ( >=dev-libs/openssl-0.9.6g )" - -RDEPEND="${DEPEND} - net-mail/mailbase - !virtual/mta - !net-mail/mailwrapper - selinux? ( sec-policy/selinux-postfix )" - -S="${WORKDIR}/${MY_SRC}" - -group_user_check() { - einfo "Checking for postfix group ..." - enewgroup postfix 207 - einfo "Checking for postdrop group ..." - enewgroup postdrop 208 - einfo "Checking for postfix user ..." - enewuser postfix 207 -1 /var/spool/postfix postfix,mail -} - -pkg_setup() { - # Add postfix, postdrop user/group (bug #77565) - group_user_check || die "Failed to check/add needed user/group" -} - -src_prepare() { - if use vda ; then - epatch "${DISTDIR}/${VDA_P}.patch" - fi - - sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ - src/util/sys_defs.h || die "sed failed" - - # change default paths to better comply with portage standard paths - sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" -} - -src_configure() { - # Make sure LDFLAGS get passed down to the executables. - local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread" - - use pam && mylibs="${mylibs} -lpam" - - if use ldap ; then - mycc="${mycc} -DHAS_LDAP" - mylibs="${mylibs} -lldap -llber" - fi - - if use mysql ; then - mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)" - mylibs="${mylibs} -lmysqlclient -lm -lz" - fi - - if use postgres ; then - mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)" - mylibs="${mylibs} -lpq -L$(pg_config --libdir)" - fi - - if use ssl ; then - mycc="${mycc} -DUSE_TLS" - mylibs="${mylibs} -lssl -lcrypto" - fi - - if use sasl ; then - if use dovecot-sasl ; then - # Set dovecot as default. - mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\"" - fi - mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" - mylibs="${mylibs} -lsasl2" - elif use dovecot-sasl ; then - mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" - fi - - if ! use nis ; then - sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \ - src/util/sys_defs.h || die "sed failed" - fi - - if use cdb ; then - mycc="${mycc} -DHAS_CDB -I/usr/include/cdb" - CDB_LIBS="" - - # Tinycdb is preferred. - if has_version dev-db/tinycdb ; then - einfo "Building with dev-db/tinycdb" - CDB_LIBS="-lcdb" - else - einfo "Building with dev-db/cdb" - CDB_PATH="/usr/$(get_libdir)" - for i in cdb.a alloc.a buffer.a unix.a byte.a ; do - CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}" - done - fi - - mylibs="${mylibs} ${CDB_LIBS}" - fi - - mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\"" - mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\"" - mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\"" - mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\"" - - # Robin H. Johnson 17/Nov/2006 - # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check. - mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" - filter-lfs-flags - - local my_cc=$(tc-getCC) - einfo "CC=${my_cc:=gcc}" - - # Workaround for bug #76512 - if use hardened ; then - [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os - fi - - emake DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ - makefiles || die "configure problem" -} - -src_install () { - /bin/sh postfix-install \ - -non-interactive \ - install_root="${D}" \ - config_directory="/usr/share/doc/${PF}/defaults" \ - readme_directory="/usr/share/doc/${PF}/readme" \ - || die "postfix-install failed" - - # Fix spool removal on upgrade - rm -Rf "${D}/var" - keepdir /var/spool/postfix - - # Install rmail for UUCP, closes bug #19127 - dobin auxiliary/rmail/rmail - - # Provide another link for legacy FSH - dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail - - # Install qshape tool - dobin auxiliary/qshape/qshape.pl - doman man/man1/qshape.1 - - # Performance tuning tools and their manuals - dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink} - doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1 - - # Set proper permissions on required files/directories - dodir /var/lib/postfix - keepdir /var/lib/postfix - fowners postfix:postfix /var/lib/postfix - fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT} - fperms 0750 /var/lib/postfix - fowners root:postdrop /usr/sbin/post{drop,queue} - fperms 02711 /usr/sbin/post{drop,queue} - - keepdir /etc/postfix - mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix - if use mbox ; then - mypostconf="mail_spool_directory=/var/spool/mail" - else - mypostconf="home_mailbox=.maildir/" - fi - "${D}/usr/sbin/postconf" -c "${D}/etc/postfix" \ - -e ${mypostconf} || die "postconf failed" - - insinto /etc/postfix - newins "${FILESDIR}/smtp.pass" saslpass - fperms 600 /etc/postfix/saslpass - - newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed" - - mv "${S}/examples" "${D}/usr/share/doc/${PF}/" - dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES* - dohtml html/* - - pamd_mimic_system smtp auth account - - if use sasl ; then - insinto /etc/sasl2 - newins "${FILESDIR}/smtp.sasl" smtpd.conf - fi -} - -pkg_postinst() { - # Add postfix, postdrop user/group (bug #77565) - group_user_check || die "Failed to check/add needed user/group" - - # Do not install server.{key,pem) SSL certificates if they already exist - if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \ - && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" - install_cert /etc/ssl/postfix/server - chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem} - fi - - ebegin "Fixing queue directories and permissions" - "${ROOT}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \ - daemon_directory=${ROOT}/usr/$(get_libdir)/postfix - echo - - if [[ ! -e /etc/mail/aliases.db ]] ; then - echo - ewarn "You must edit /etc/mail/aliases to suit your needs" - ewarn "and then run /usr/bin/newaliases. Postfix will not" - ewarn "work correctly without it." - fi - - if [[ -e /etc/mailer.conf ]] ; then - einfo - einfo "mailwrapper support is discontinued." - einfo "You may want to 'emerge -C mailwrapper' now." - einfo - fi - - elog - elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}" - elog "for incompatibilities and other major changes between releases." - elog -} -- cgit v1.2.3-65-gdbad