| 1 |
commit: bb7f219c99bd6dfcac19d0d88dbfe106132c1173 |
| 2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
| 3 |
AuthorDate: Wed Aug 7 09:49:34 2019 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 10 05:56:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7f219c |
| 7 |
|
| 8 |
mail-mta/netqmail: fix build without ssl |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/649854 |
| 11 |
Closes: https://bugs.gentoo.org/674688 |
| 12 |
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/12630 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
mail-mta/netqmail/netqmail-1.06-r4.ebuild | 14 ++++++++------ |
| 17 |
mail-mta/netqmail/netqmail-1.06-r5.ebuild | 16 +++++++++------- |
| 18 |
mail-mta/netqmail/netqmail-1.06-r6.ebuild | 16 +++++++++------- |
| 19 |
3 files changed, 26 insertions(+), 20 deletions(-) |
| 20 |
|
| 21 |
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild |
| 22 |
index 1f750f0f171..aa64d3d57d5 100644 |
| 23 |
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild |
| 24 |
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild |
| 25 |
@@ -101,12 +101,14 @@ src_prepare() { |
| 26 |
ht_fix_file Makefile* |
| 27 |
|
| 28 |
if ! use vanilla; then |
| 29 |
- # This patch contains relative paths and needs to be cleaned up. |
| 30 |
- sed 's~^--- ../../~--- ~g' \ |
| 31 |
- <"${DISTDIR}"/${QMAIL_TLS_F} \ |
| 32 |
- >"${T}"/${QMAIL_TLS_F} || die |
| 33 |
- use ssl && epatch "${T}"/${QMAIL_TLS_F} |
| 34 |
- use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE} |
| 35 |
+ if use ssl; then |
| 36 |
+ # This patch contains relative paths and needs to be cleaned up. |
| 37 |
+ sed 's~^--- ../../~--- ~g' \ |
| 38 |
+ < "${DISTDIR}"/${QMAIL_TLS_F} \ |
| 39 |
+ > "${T}"/${QMAIL_TLS_F} || die |
| 40 |
+ epatch "${T}"/${QMAIL_TLS_F} |
| 41 |
+ epatch "${DISTDIR}"/${QMAIL_TLS_CVE} |
| 42 |
+ fi |
| 43 |
use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F} |
| 44 |
|
| 45 |
if use qmail-spp; then |
| 46 |
|
| 47 |
diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild b/mail-mta/netqmail/netqmail-1.06-r5.ebuild |
| 48 |
index 31387c27673..f6f4cfb3dee 100644 |
| 49 |
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild |
| 50 |
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild |
| 51 |
@@ -105,12 +105,14 @@ src_prepare() { |
| 52 |
ht_fix_file Makefile* |
| 53 |
|
| 54 |
if ! use vanilla; then |
| 55 |
- # This patch contains relative paths and needs to be cleaned up. |
| 56 |
- sed 's~^--- ../../~--- ~g' \ |
| 57 |
- <"${DISTDIR}"/${QMAIL_TLS_F} \ |
| 58 |
- >"${T}"/${QMAIL_TLS_F} || die |
| 59 |
- use ssl && epatch "${T}"/${QMAIL_TLS_F} |
| 60 |
- use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE} |
| 61 |
+ if use ssl; then |
| 62 |
+ # This patch contains relative paths and needs to be cleaned up. |
| 63 |
+ sed 's~^--- ../../~--- ~g' \ |
| 64 |
+ < "${DISTDIR}"/${QMAIL_TLS_F} \ |
| 65 |
+ > "${T}"/${QMAIL_TLS_F} || die |
| 66 |
+ epatch "${T}"/${QMAIL_TLS_F} |
| 67 |
+ epatch "${DISTDIR}"/${QMAIL_TLS_CVE} |
| 68 |
+ fi |
| 69 |
use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F} |
| 70 |
|
| 71 |
if use qmail-spp; then |
| 72 |
@@ -127,7 +129,7 @@ src_prepare() { |
| 73 |
|
| 74 |
cd "${WORKDIR}" || die |
| 75 |
epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch |
| 76 |
- epatch "${FILESDIR}"/qmail-smtputf8.patch |
| 77 |
+ use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch |
| 78 |
cd - || die |
| 79 |
|
| 80 |
qmail_src_postunpack |
| 81 |
|
| 82 |
diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild |
| 83 |
index ea0d2b7b10c..f78baf94aac 100644 |
| 84 |
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild |
| 85 |
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild |
| 86 |
@@ -105,12 +105,14 @@ src_prepare() { |
| 87 |
ht_fix_file Makefile* |
| 88 |
|
| 89 |
if ! use vanilla; then |
| 90 |
- # This patch contains relative paths and needs to be cleaned up. |
| 91 |
- sed 's~^--- ../../~--- ~g' \ |
| 92 |
- <"${DISTDIR}"/${QMAIL_TLS_F} \ |
| 93 |
- >"${T}"/${QMAIL_TLS_F} || die |
| 94 |
- use ssl && epatch "${T}"/${QMAIL_TLS_F} |
| 95 |
- use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE} |
| 96 |
+ if use ssl; then |
| 97 |
+ # This patch contains relative paths and needs to be cleaned up. |
| 98 |
+ sed 's~^--- ../../~--- ~g' \ |
| 99 |
+ < "${DISTDIR}"/${QMAIL_TLS_F} \ |
| 100 |
+ > "${T}"/${QMAIL_TLS_F} || die |
| 101 |
+ epatch "${T}"/${QMAIL_TLS_F} |
| 102 |
+ epatch "${DISTDIR}"/${QMAIL_TLS_CVE} |
| 103 |
+ fi |
| 104 |
use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F} |
| 105 |
|
| 106 |
if use qmail-spp; then |
| 107 |
@@ -127,7 +129,7 @@ src_prepare() { |
| 108 |
|
| 109 |
cd "${WORKDIR}" || die |
| 110 |
epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch |
| 111 |
- epatch "${FILESDIR}"/qmail-smtputf8.patch |
| 112 |
+ use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch |
| 113 |
cd - || die |
| 114 |
|
| 115 |
qmail_src_postunpack |
Archives