From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CBD6138334 for ; Sat, 10 Aug 2019 05:56:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 774AEE082D; Sat, 10 Aug 2019 05:56:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C60AE082D for ; Sat, 10 Aug 2019 05:56:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 089F43497DA for ; Sat, 10 Aug 2019 05:56:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 517C4738 for ; Sat, 10 Aug 2019 05:56:30 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1565416561.bb7f219c99bd6dfcac19d0d88dbfe106132c1173.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/netqmail/netqmail-1.06-r4.ebuild mail-mta/netqmail/netqmail-1.06-r5.ebuild mail-mta/netqmail/netqmail-1.06-r6.ebuild X-VCS-Directories: mail-mta/netqmail/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: bb7f219c99bd6dfcac19d0d88dbfe106132c1173 X-VCS-Branch: master Date: Sat, 10 Aug 2019 05:56:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bf1bd060-9957-4bda-bb62-14471c4cb2d1 X-Archives-Hash: 310ab7c57368ede5a1176d3db8b5b3a0 commit: bb7f219c99bd6dfcac19d0d88dbfe106132c1173 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Aug 7 09:49:34 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Aug 10 05:56:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7f219c mail-mta/netqmail: fix build without ssl Closes: https://bugs.gentoo.org/649854 Closes: https://bugs.gentoo.org/674688 Signed-off-by: Rolf Eike Beer sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/12630 Signed-off-by: Joonas Niilola gentoo.org> mail-mta/netqmail/netqmail-1.06-r4.ebuild | 14 ++++++++------ mail-mta/netqmail/netqmail-1.06-r5.ebuild | 16 +++++++++------- mail-mta/netqmail/netqmail-1.06-r6.ebuild | 16 +++++++++------- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild index 1f750f0f171..aa64d3d57d5 100644 --- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild @@ -101,12 +101,14 @@ src_prepare() { ht_fix_file Makefile* if ! use vanilla; then - # This patch contains relative paths and needs to be cleaned up. - sed 's~^--- ../../~--- ~g' \ - <"${DISTDIR}"/${QMAIL_TLS_F} \ - >"${T}"/${QMAIL_TLS_F} || die - use ssl && epatch "${T}"/${QMAIL_TLS_F} - use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE} + if use ssl; then + # This patch contains relative paths and needs to be cleaned up. + sed 's~^--- ../../~--- ~g' \ + < "${DISTDIR}"/${QMAIL_TLS_F} \ + > "${T}"/${QMAIL_TLS_F} || die + epatch "${T}"/${QMAIL_TLS_F} + epatch "${DISTDIR}"/${QMAIL_TLS_CVE} + fi use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F} if use qmail-spp; then diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild b/mail-mta/netqmail/netqmail-1.06-r5.ebuild index 31387c27673..f6f4cfb3dee 100644 --- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild @@ -105,12 +105,14 @@ src_prepare() { ht_fix_file Makefile* if ! use vanilla; then - # This patch contains relative paths and needs to be cleaned up. - sed 's~^--- ../../~--- ~g' \ - <"${DISTDIR}"/${QMAIL_TLS_F} \ - >"${T}"/${QMAIL_TLS_F} || die - use ssl && epatch "${T}"/${QMAIL_TLS_F} - use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE} + if use ssl; then + # This patch contains relative paths and needs to be cleaned up. + sed 's~^--- ../../~--- ~g' \ + < "${DISTDIR}"/${QMAIL_TLS_F} \ + > "${T}"/${QMAIL_TLS_F} || die + epatch "${T}"/${QMAIL_TLS_F} + epatch "${DISTDIR}"/${QMAIL_TLS_CVE} + fi use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F} if use qmail-spp; then @@ -127,7 +129,7 @@ src_prepare() { cd "${WORKDIR}" || die epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch - epatch "${FILESDIR}"/qmail-smtputf8.patch + use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch cd - || die qmail_src_postunpack diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild index ea0d2b7b10c..f78baf94aac 100644 --- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild @@ -105,12 +105,14 @@ src_prepare() { ht_fix_file Makefile* if ! use vanilla; then - # This patch contains relative paths and needs to be cleaned up. - sed 's~^--- ../../~--- ~g' \ - <"${DISTDIR}"/${QMAIL_TLS_F} \ - >"${T}"/${QMAIL_TLS_F} || die - use ssl && epatch "${T}"/${QMAIL_TLS_F} - use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE} + if use ssl; then + # This patch contains relative paths and needs to be cleaned up. + sed 's~^--- ../../~--- ~g' \ + < "${DISTDIR}"/${QMAIL_TLS_F} \ + > "${T}"/${QMAIL_TLS_F} || die + epatch "${T}"/${QMAIL_TLS_F} + epatch "${DISTDIR}"/${QMAIL_TLS_CVE} + fi use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F} if use qmail-spp; then @@ -127,7 +129,7 @@ src_prepare() { cd "${WORKDIR}" || die epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch - epatch "${FILESDIR}"/qmail-smtputf8.patch + use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch cd - || die qmail_src_postunpack