| 1 |
commit: 7fb393aeb888002be6672392622f80749be11316 |
| 2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 24 17:33:29 2015 +0000 |
| 4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 24 17:33:29 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb393ae |
| 7 |
|
| 8 |
mail-mta/postfix: Fix multi instance setup |
| 9 |
|
| 10 |
Gentoo-Bug: 561278 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.21 |
| 13 |
|
| 14 |
...ostfix-3.1_pre20150913.ebuild => postfix-3.0.2-r1.ebuild} | 12 ++++++++---- |
| 15 |
mail-mta/postfix/postfix-3.1_pre20150913.ebuild | 1 - |
| 16 |
2 files changed, 8 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild b/mail-mta/postfix/postfix-3.0.2-r1.ebuild |
| 19 |
similarity index 95% |
| 20 |
copy from mail-mta/postfix/postfix-3.1_pre20150913.ebuild |
| 21 |
copy to mail-mta/postfix/postfix-3.0.2-r1.ebuild |
| 22 |
index cbbcfdc..679f48e 100644 |
| 23 |
--- a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild |
| 24 |
+++ b/mail-mta/postfix/postfix-3.0.2-r1.ebuild |
| 25 |
@@ -5,9 +5,9 @@ |
| 26 |
EAPI=5 |
| 27 |
inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator |
| 28 |
|
| 29 |
-MY_PV="${PV/_pre/-}" |
| 30 |
+MY_PV="${PV/_rc/-RC}" |
| 31 |
MY_SRC="${PN}-${MY_PV}" |
| 32 |
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental" |
| 33 |
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" |
| 34 |
VDA_PV="2.10.0" |
| 35 |
VDA_P="${PN}-vda-v13-${VDA_PV}" |
| 36 |
RC_VER="2.7" |
| 37 |
@@ -80,6 +80,11 @@ src_prepare() { |
| 38 |
# change default paths to better comply with portage standard paths |
| 39 |
sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" |
| 40 |
|
| 41 |
+ sed -i -e "/readme_directory\/CONNECTION_CACHE_README/ i\ |
| 42 |
+ \$readme_directory\/COMPATIBILITY_README:f:root:-:644" conf/postfix-files |
| 43 |
+ sed -i -e "/html_directory\/CONNECTION_CACHE_README/ i\ |
| 44 |
+ \$html_directory\/COMPATIBILITY_README.html:f:root:-:644" conf/postfix-files |
| 45 |
+ |
| 46 |
epatch_user |
| 47 |
} |
| 48 |
|
| 49 |
@@ -192,7 +197,7 @@ src_configure() { |
| 50 |
sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs |
| 51 |
sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs |
| 52 |
|
| 53 |
- emake makefiles shared=yes dynamicmaps=no pie=yes \ |
| 54 |
+ emake makefiles shared=yes dynamicmaps=no \ |
| 55 |
shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \ |
| 56 |
DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ |
| 57 |
AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \ |
| 58 |
@@ -267,7 +272,6 @@ src_install () { |
| 59 |
use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" |
| 60 |
|
| 61 |
dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* |
| 62 |
- mv "${D}"/etc/postfix/{*.default,*.proto} "${D}"/usr/share/doc/${PF}/ |
| 63 |
use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ |
| 64 |
|
| 65 |
pamd_mimic_system smtp auth account |
| 66 |
|
| 67 |
diff --git a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild b/mail-mta/postfix/postfix-3.1_pre20150913.ebuild |
| 68 |
index cbbcfdc..14d5902 100644 |
| 69 |
--- a/mail-mta/postfix/postfix-3.1_pre20150913.ebuild |
| 70 |
+++ b/mail-mta/postfix/postfix-3.1_pre20150913.ebuild |
| 71 |
@@ -267,7 +267,6 @@ src_install () { |
| 72 |
use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" |
| 73 |
|
| 74 |
dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* |
| 75 |
- mv "${D}"/etc/postfix/{*.default,*.proto} "${D}"/usr/share/doc/${PF}/ |
| 76 |
use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ |
| 77 |
|
| 78 |
pamd_mimic_system smtp auth account |
Archives