[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/
Date: Sat, 10 Aug 2019 05:56:30 +0000 (UTC)	[thread overview]
Message-ID: <1565416561.bb7f219c99bd6dfcac19d0d88dbfe106132c1173.juippis@gentoo> (raw)

commit:     bb7f219c99bd6dfcac19d0d88dbfe106132c1173
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Aug  7 09:49:34 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12630
Signed-off-by: Joonas Niilola <juippis <AT> 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

next             reply	other threads:[~2019-08-10  5:56 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-10  5:56 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-17 23:27 [gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/ Michael Orlitzky
2023-06-23 18:07 Matt Turner
2022-12-31 22:40 Sam James
2022-12-31 18:32 Jakov Smolić
2021-11-07  7:51 Sam James
2021-08-19  2:12 Sam James
2021-06-17 15:56 Sergei Trofimovich
2020-12-30 17:01 Sergei Trofimovich
2020-06-04 14:10 Sergei Trofimovich
2020-06-03 18:42 Agostino Sarubbo
2020-05-25  9:36 Sergei Trofimovich
2020-05-22  8:02 Sergei Trofimovich
2020-01-25 21:01 Sergei Trofimovich
2020-01-25 19:04 Sergei Trofimovich
2020-01-25 18:02 Sergei Trofimovich
2020-01-01 12:53 Agostino Sarubbo
2019-12-31 14:23 Agostino Sarubbo
2019-12-31 14:21 Agostino Sarubbo
2019-12-31 14:16 Agostino Sarubbo
2019-12-31 14:06 Agostino Sarubbo
2019-12-30 23:01 Sergei Trofimovich
2019-12-30 15:17 Sergei Trofimovich
2019-12-30 15:16 Sergei Trofimovich
2019-11-01 14:11 Joonas Niilola
2019-10-11 14:16 Joonas Niilola
2019-10-10  6:24 Andreas Sturmlechner
2019-10-04  4:38 Joonas Niilola
2019-10-04  4:38 Joonas Niilola
2019-09-25 12:51 Joonas Niilola
2019-09-21 14:49 Joonas Niilola
2019-09-21 14:49 Joonas Niilola
2019-09-19 16:21 Joonas Niilola
2019-09-13  6:21 Sergei Trofimovich
2019-07-13  9:02 Hans de Graaff
2019-07-13  7:59 Hans de Graaff
2019-07-13  7:59 Hans de Graaff
2019-07-13  7:59 Hans de Graaff
2019-05-19 14:18 Sergei Trofimovich
2019-01-07 19:15 Lars Wendler
2018-04-24 19:38 Mikle Kolyada
2018-02-27 22:28 Sergei Trofimovich
2018-02-27 20:08 Sergei Trofimovich
2018-02-06 18:36 Thomas Deutschmann
2018-01-28 16:59 Tobias Klausmann
2017-12-14 20:11 Sergei Trofimovich
2017-09-02 14:15 Michael Palimaka
2015-10-23 21:09 Michał Górny
2015-10-11  1:00 Anthony G. Basile

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:1f750f0f17 dfblob:aa64d3d57d dfblob:31387c2767
dfblob:f6f4cfb3de dfblob:ea0d2b7b10 dfblob:f78baf94aa )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565416561.bb7f219c99bd6dfcac19d0d88dbfe106132c1173.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox