commit: 7fb393aeb888002be6672392622f80749be11316
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 17:33:29 2015 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 17:33:29 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb393ae
mail-mta/postfix: Fix multi instance setup
Gentoo-Bug: 561278
Package-Manager: portage-2.2.21
...ostfix-3.1_pre20150913.ebuild => postfix-3.0.2-r1.ebuild} | 12 ++++++++----
mail-mta/postfix/postfix-3.1_pre20150913.ebuild | 1 -
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild
b/mail-mta/postfix/postfix-3.0.2-r1.ebuild
similarity index 95%
copy from mail-mta/postfix/postfix-3.1_pre20150913.ebuild
copy to mail-mta/postfix/postfix-3.0.2-r1.ebuild
index cbbcfdc..679f48e 100644
--- a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild
+++ b/mail-mta/postfix/postfix-3.0.2-r1.ebuild
@@ -5,9 +5,9 @@
EAPI=5
inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user
versionator
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental";
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official";
VDA_PV="2.10.0"
VDA_P="${PN}-vda-v13-${VDA_PV}"
RC_VER="2.7"
@@ -80,6 +80,11 @@ src_prepare() {
# change default paths to better comply with portage standard paths
sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+ sed -i -e "/readme_directory\/CONNECTION_CACHE_README/ i\
+ \$readme_directory\/COMPATIBILITY_README:f:root:-:644"
conf/postfix-files
+ sed -i -e "/html_directory\/CONNECTION_CACHE_README/ i\
+ \$html_directory\/COMPATIBILITY_README.html:f:root:-:644"
conf/postfix-files
+
epatch_user
}
@@ -192,7 +197,7 @@ src_configure() {
sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
- emake makefiles shared=yes dynamicmaps=no pie=yes \
+ emake makefiles shared=yes dynamicmaps=no \
shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}"
AUXLIBS="${mylibs}" \
AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
@@ -267,7 +272,6 @@ src_install () {
use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,*.proto} "${D}"/usr/share/doc/${PF}/
use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
pamd_mimic_system smtp auth account
diff --git a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild
b/mail-mta/postfix/postfix-3.1_pre20150913.ebuild
index cbbcfdc..14d5902 100644
--- a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild
+++ b/mail-mta/postfix/postfix-3.1_pre20150913.ebuild
@@ -267,7 +267,6 @@ src_install () {
use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,*.proto} "${D}"/usr/share/doc/${PF}/
use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
pamd_mimic_system smtp auth account
