Also in GitHub as https://github.com/gentoo/gentoo/pull/12632 and https://
github.com/gentoo/gentoo/pull/12631.
I have not seen any qmail patch every modifying makelib, so the change is
rather direct in contrast to the compiler settings in the same function.
To verify the man change look at the current install, it has dot-qmail.N once
in man5 with the correct contents and once in man8, where one finds the
template.
There is a third (net)qmail PR open if you like to look into qmail code:
https://github.com/gentoo/gentoo/pull/12630
Greetings
Eike>From 3a3d81e0828d3362f868b09fc7ebbef9c7148701 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer
Date: Wed, 7 Aug 2019 11:49:34 +0200
Subject: [PATCH] mail-mta/netqmail: fix build without ssl
Closes: https://bugs.gentoo.org/649854
Signed-off-by: Rolf Eike Beer
---
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 1f750f0f17..aa64d3d57d 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 31387c2767..f6f4cfb3de 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 ea0d2b7b10..f78baf94aa 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
--
2.16.4
>From 05b14c5edb506a72c9626212fb0331ff33a173b7 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer
Date: Wed, 7 Aug 2019 12:26:17 +0200
Subject: [PATCH] qmail eclass: do not install man templates to section 8
The files named *.9 are actually only templates for the real manpages, some of
them _not_ in section 8 at all. Those are properly gerated and installed anyway,
so just leave these alone as they were never meant to be installed.
Signed-off-by: Rolf Eike Beer
---
eclass/qmail.eclass | 6 --
1 file changed,
