From 28c64ed6c8450366b413e6eb939b79bd874e8695 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Tue, 24 Apr 2007 19:26:43 +0000 Subject: [PATCH] Misc fixes, see ChangeLog. Package-Manager: portage-2.1.2.3 --- mail-mta/postfix/ChangeLog | 10 +- mail-mta/postfix/Manifest | 30 +- .../postfix/files/digest-postfix-2.4.0-r1 | 6 + mail-mta/postfix/postfix-2.4.0-r1.ebuild | 373 ++++++++++++++++++ 4 files changed, 400 insertions(+), 19 deletions(-) create mode 100644 mail-mta/postfix/files/digest-postfix-2.4.0-r1 create mode 100644 mail-mta/postfix/postfix-2.4.0-r1.ebuild diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog index aba83d9202ab..31356382148c 100644 --- a/mail-mta/postfix/ChangeLog +++ b/mail-mta/postfix/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-mta/postfix # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.124 2007/04/08 01:44:13 falco Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.125 2007/04/24 19:26:43 chtekk Exp $ + +*postfix-2.4.0-r1 (24 Apr 2007) + + 24 Apr 2007; Luca Longinotti +postfix-2.4.0-r1.ebuild: + General ebuild cleanup, now correctly supports lib/lib64 dirs. Large file + support (fixes bug #174099). Fix CDB/TinyCDB library linking (fixes bug + #174948). Use new VDA-NG patch, partial rewrite of the VDA-e patch, with + bugfixes and new features. *postfix-2.4.0 (08 Apr 2007) diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index 13df6a25c6af..f8d788541d34 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839 MD5 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 files/mailer.conf 438 @@ -63,6 +60,7 @@ DIST postfix-2.3.3-vda.patch.gz 7944 RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252 DIST postfix-2.3.6.tar.gz 2783743 RMD160 075abdb127ebef529388dcbfe36af277bab9d7d1 SHA1 6675da860f92237357c0f23214131500951d99a8 SHA256 2ae5d7d6d03d26a7f7b4b4aa1f1ab87017352a8bf9541171e318393fe5309fce DIST postfix-2.3.7.tar.gz 2785739 RMD160 5d3c1074f2ab02fba60cc5d7251af45bb15c9068 SHA1 caac1243ea3cbb5f60380d5614f48cc21d3cff33 SHA256 5ea8f9f9b205145b23764b226eea0e4cdfd6489cd5fbacadd61580982e46538d DIST postfix-2.3.8.tar.gz 2787761 RMD160 2984ca8e81375a3124801c999d23637e745de54c SHA1 c40ebae5cdcd53e13ae8ba5cac1a70167576859b SHA256 f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6 +DIST postfix-2.4.0-vda-ng-r1.patch.gz 12015 RMD160 8ef868bccd69e1c57c67eac524f617ca6eaffb94 SHA1 62c11debf6422920a070f42d6fcbf7728082be9f SHA256 d905ad2084d7f6e7eb831cd3d5b95386c3d78ed389e104dd8a4abc3ecb954496 DIST postfix-2.4.0-vda.patch.gz 7830 RMD160 0cfc1765b32bc894888517f6d210d2baf1615d56 SHA1 0e1de0bb9de24ea9766d9930a945e3b94fc2a250 SHA256 ff8c79db9128be5f2347259ea46606338d3808cc5120ce45d6ef9453e04cd7e7 DIST postfix-2.4.0.tar.gz 2931537 RMD160 00eb9e4510da1f6a0a0238417d147774deac50ce SHA1 6223225e5ab116e09da27709ebce7dac3136fbe7 SHA256 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd DIST tls+ipv6-1.26-pf-2.1.5.patch.gz 256725 RMD160 ff2fb005681659476383fe4f32fd1d14e51fa9d9 SHA1 6813eb7d1c1ac9a76a04b7495d540236aa0aa625 SHA256 9ce416069f8dec16a9fc31aee875f8832cd97c167ceee0e572ef10b94ae4849d @@ -122,14 +120,18 @@ EBUILD postfix-2.3.8.ebuild 11693 RMD160 40cd50eee6bbba23e123a59eccaf01f675d1f30 MD5 97b85ad61e58f97ba07652873c6b2898 postfix-2.3.8.ebuild 11693 RMD160 40cd50eee6bbba23e123a59eccaf01f675d1f303 postfix-2.3.8.ebuild 11693 SHA256 dd10252221134c446d7c2ddb40247dee3735fb88fb058feafd05582b1aafffdc postfix-2.3.8.ebuild 11693 +EBUILD postfix-2.4.0-r1.ebuild 11507 RMD160 74366bc74ebebca96953ceb65a0a788b9f24cab1 SHA1 ff3d50930815e4c313de66523f732121a6109795 SHA256 c9b72f0dd98a0f8d01af0ae2297ae3f5852c8cde8dd4bb50812d61cdf9530cd6 +MD5 7725af0954645f43fce990da0120594b postfix-2.4.0-r1.ebuild 11507 +RMD160 74366bc74ebebca96953ceb65a0a788b9f24cab1 postfix-2.4.0-r1.ebuild 11507 +SHA256 c9b72f0dd98a0f8d01af0ae2297ae3f5852c8cde8dd4bb50812d61cdf9530cd6 postfix-2.4.0-r1.ebuild 11507 EBUILD postfix-2.4.0.ebuild 11870 RMD160 b0f0b875f8f9f3b638e5c58ec90953a8f4e91b34 SHA1 d32c45d5a818e88fcbe992444a9f7dc84a4dcd7c SHA256 4ad273cf308da48f4faa0e5d307b1cdae7f9342e58cf45317ef80d18b7a8756a MD5 21112140ddddf78ed83a15815d4e9000 postfix-2.4.0.ebuild 11870 RMD160 b0f0b875f8f9f3b638e5c58ec90953a8f4e91b34 postfix-2.4.0.ebuild 11870 SHA256 4ad273cf308da48f4faa0e5d307b1cdae7f9342e58cf45317ef80d18b7a8756a postfix-2.4.0.ebuild 11870 -MISC ChangeLog 42596 RMD160 264c4042c95a6d1eb420ec0d37dfe1ab2fb6825c SHA1 0651369a293da7633c0a183df19b5d07184c4361 SHA256 818a7501be0f166ef96ad550722bc069b6a13ecf84bd1970585fdc390ad9d9c9 -MD5 90125d70cb384645375adf47d0787dd4 ChangeLog 42596 -RMD160 264c4042c95a6d1eb420ec0d37dfe1ab2fb6825c ChangeLog 42596 -SHA256 818a7501be0f166ef96ad550722bc069b6a13ecf84bd1970585fdc390ad9d9c9 ChangeLog 42596 +MISC ChangeLog 42962 RMD160 7159f83c930a02f992be12edcdc70484853e04f0 SHA1 649325894587ccf171bb94aae78f88eba3520804 SHA256 9669edcdc537afff1c6837ed6d2ef88a22065dc23531f89f69449e29c3f513c0 +MD5 569a92f3d0d24e69a29f7d0b160b892c ChangeLog 42962 +RMD160 7159f83c930a02f992be12edcdc70484853e04f0 ChangeLog 42962 +SHA256 9669edcdc537afff1c6837ed6d2ef88a22065dc23531f89f69449e29c3f513c0 ChangeLog 42962 MISC metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b SHA1 6c1c3f1fda858526944eb427f5bec79da119da0d SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253 @@ -179,14 +181,6 @@ SHA256 b8294770197613e1d50b69e88044824637c2de976ec848e9f3e749a331471382 files/di MD5 327052f24d7ca239a727a4f5cfbbae6f files/digest-postfix-2.4.0 497 RMD160 a7004813dc4b7b343ddb92788a1f14edb450391f files/digest-postfix-2.4.0 497 SHA256 e47c2c1c24ab3af5002a1dd52ed6408156dc785ab3c7f9477c69cb40ae303fb8 files/digest-postfix-2.4.0 497 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iQEVAwUBRhhI9zvRww8BFPxFAQKJTAf/cq8DIQBF2IxWDPuJ6qCvqpf7wI2vGIeH -9uSwm0T06h/ATe6cqKdXWlh9MGQJauz4s/ExbdxD0Zuvd37hHKpS2Wv0MSRJkwBv -u6W4XrWc4Esp0iDRi0ul1XYtSYVjLVIBoknp72a8+Ml3K5vMSrBQ6wmrlgc8PE6G -ZVGBnUGV3G3NEm5m/O17Sfes14JzXfjUt3r09rr51DHCfzaIrTCEqfuG06b3VFNb -reDdDMBl9yKOQ3yeIgKTBdQ2VJkB1dNH78fNAgUWVnaYgi6Y4hFgxnxgpwYl3TWf -1yNN4O3QQphT2esl/U/a628lVd45X0SnSmtjY5EJBdweaqeymqKHXg== -=wQa8 ------END PGP SIGNATURE----- +MD5 3666108d27fd8ea56ae7874e4a15ec62 files/digest-postfix-2.4.0-r1 518 +RMD160 6c6b6179f2b5d95f48b628b9290a590f2d6a3e75 files/digest-postfix-2.4.0-r1 518 +SHA256 cab68d27d89dba71037c6350ba37a48a137c370db249a57686f58eeb970c9243 files/digest-postfix-2.4.0-r1 518 diff --git a/mail-mta/postfix/files/digest-postfix-2.4.0-r1 b/mail-mta/postfix/files/digest-postfix-2.4.0-r1 new file mode 100644 index 000000000000..c8e96a876133 --- /dev/null +++ b/mail-mta/postfix/files/digest-postfix-2.4.0-r1 @@ -0,0 +1,6 @@ +MD5 48bab5796d79130e9d850ed713b3b4e1 postfix-2.4.0-vda-ng-r1.patch.gz 12015 +RMD160 8ef868bccd69e1c57c67eac524f617ca6eaffb94 postfix-2.4.0-vda-ng-r1.patch.gz 12015 +SHA256 d905ad2084d7f6e7eb831cd3d5b95386c3d78ed389e104dd8a4abc3ecb954496 postfix-2.4.0-vda-ng-r1.patch.gz 12015 +MD5 45c56b112a6cd9ba08ac99dfd734ea9d postfix-2.4.0.tar.gz 2931537 +RMD160 00eb9e4510da1f6a0a0238417d147774deac50ce postfix-2.4.0.tar.gz 2931537 +SHA256 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd postfix-2.4.0.tar.gz 2931537 diff --git a/mail-mta/postfix/postfix-2.4.0-r1.ebuild b/mail-mta/postfix/postfix-2.4.0-r1.ebuild new file mode 100644 index 000000000000..45e33aea5299 --- /dev/null +++ b/mail-mta/postfix/postfix-2.4.0-r1.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.0-r1.ebuild,v 1.1 2007/04/24 19:26:43 chtekk Exp $ + +# NOTE: this ebuild is a regular ebuild without mailer-config support! +# Comment lines below "regular ebuild" and uncomment lines below "mailer-config support" +# to turn this ebuild to a mailer-config enabled ebuild. + +# regular ebuild +inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam +# mailer-config support +#inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + +# regular ebuild +IUSE="cdb dovecot-sasl hardened ipv6 ldap mailwrapper mbox mysql nis pam postgres sasl selinux ssl vda" +# mailer-config support +#IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda" + +MY_PV="${PV/_rc/-RC}" +MY_SRC="${PN}-${MY_PV}" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" +VDA_P="${P}-vda-ng-r1" +RC_VER="2.2.9" + +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://gentoo.longitekk.com/${VDA_P}.patch.gz ) " + +LICENSE="IPL-1" +SLOT="0" + +# regular ebuild +PROVIDE="virtual/mta virtual/mda" +# mailer-config support +#PROVIDE="${PROVIDE} 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-7.1 ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( >=dev-libs/openssl-0.9.6g )" + +# regular ebuild +RDEPEND="${DEPEND} + >=net-mail/mailbase-0.00 + !mailwrapper? ( !virtual/mta ) + mailwrapper? ( >=net-mail/mailwrapper-0.2 ) + selinux? ( sec-policy/selinux-postfix )" + +# mailer-config support +#RDEPEND="${DEPEND} +# >=net-mail/mailbase-0.00 +# 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() { + # Do not upgrade live from Postfix <2.4 + if [[ -f /var/lib/init.d/started/postfix ]] ; then + if has_version ' 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 + [[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os + + make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ + makefiles || die "configure problem" + + emake || die "compile 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 + + # mailwrapper stuff + if use mailwrapper ; then + mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix" + mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix" + # mailer-config support + #rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases" + + mv "${D}/usr/share/man/man1/sendmail.1" \ + "${D}/usr/share/man/man1/sendmail-postfix.1" + mv "${D}/usr/share/man/man1/newaliases.1" \ + "${D}/usr/share/man/man1/newaliases-postfix.1" + mv "${D}/usr/share/man/man1/mailq.1" \ + "${D}/usr/share/man/man1/mailq-postfix.1" + mv "${D}/usr/share/man/man5/aliases.5" \ + "${D}/usr/share/man/man5/aliases-postfix.5" + + # regular ebuild + insinto /etc/mail + doins "${FILESDIR}/mailer.conf" + # mailer-config support + #mailer_install_conf + else + # Provide another link for legacy FSH + dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail + fi + + # Install qshape tool + dobin auxiliary/qshape/qshape.pl + + # 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 + 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,post*-*} "${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 LICENSE PORTING RELEASE_NOTES* + dohtml html/* + + pamd_mimic_system smtp auth account + + # Do not install server.{key,pem) SSL certificates if they already exist + if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]] ; then + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" + insinto /etc/ssl/postfix + docert server + fowners postfix:mail /etc/ssl/postfix/server.{key,pem} + fi + + 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" + + ebegin "Fixing queue directories and permissions" + "${ROOT}/etc/postfix/post-install" upgrade-permissions + echo + ewarn "If you upgraded from Postfix-1.x, you must revisit" + ewarn "your configuration files. See" + ewarn " /usr/share/doc/${PF}/RELEASE_NOTES" + ewarn "for a list of changes." + + 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 + + # regular ebuild + if ! use mailwrapper && [[ -e /etc/mailer.conf ]] ; then + einfo + einfo "Since you emerged Postfix without mailwrapper in USE," + einfo "you may want to 'emerge -C mailwrapper' now." + einfo + fi + # mailer-config support + #mailer_pkg_postinst +} -- 2.26.2