1 |
commit: 9e1bcf7d0aa3975961de47467ed2185b3330c348 |
2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
3 |
AuthorDate: Sat Dec 31 21:32:05 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 22:40:03 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1bcf7d |
7 |
|
8 |
mail-mta/n[eo]tqmail: drop ucspi-ssl dependency for pop3s |
9 |
|
10 |
Bug: https://bugs.gentoo.org/889216 |
11 |
Bug: https://bugs.gentoo.org/889218 |
12 |
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
eclass/qmail.eclass | 10 ++-------- |
16 |
mail-mta/netqmail/netqmail-1.06-r14.ebuild | 5 +---- |
17 |
mail-mta/netqmail/netqmail-1.06-r16.ebuild | 5 +---- |
18 |
mail-mta/notqmail/notqmail-1.08-r5.ebuild | 3 --- |
19 |
mail-mta/notqmail/notqmail-1.08-r6.ebuild | 3 --- |
20 |
mail-mta/notqmail/notqmail-9999.ebuild | 3 --- |
21 |
6 files changed, 4 insertions(+), 25 deletions(-) |
22 |
|
23 |
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass |
24 |
index 67069087376d..b647ac5d8e3a 100644 |
25 |
--- a/eclass/qmail.eclass |
26 |
+++ b/eclass/qmail.eclass |
27 |
@@ -240,7 +240,7 @@ qmail_tcprules_install() { |
28 |
insinto "${TCPRULES_DIR}" |
29 |
doins "${GENQMAIL_S}"/tcprules/Makefile.qmail |
30 |
doins "${GENQMAIL_S}"/tcprules/tcp.qmail-* |
31 |
- use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd |
32 |
+ rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd |
33 |
} |
34 |
|
35 |
qmail_supervise_install_one() { |
36 |
@@ -263,7 +263,6 @@ qmail_supervise_install() { |
37 |
|
38 |
if use pop3; then |
39 |
qmail_supervise_install_one qmail-pop3d |
40 |
- use ssl && qmail_supervise_install_one qmail-pop3sd |
41 |
fi |
42 |
} |
43 |
|
44 |
@@ -344,7 +343,7 @@ qmail_rootmail_fixup() { |
45 |
} |
46 |
|
47 |
qmail_tcprules_build() { |
48 |
- for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do |
49 |
+ for f in tcp.qmail-{smtp,qmtp,qmqp,pop3}; do |
50 |
# please note that we don't check if it exists |
51 |
# as we want it to make the cdb files anyway! |
52 |
src="${ROOT}${TCPRULES_DIR}/${f}" |
53 |
@@ -371,11 +370,6 @@ qmail_supervise_config_notice() { |
54 |
elog "To start the pop3 server as well, create the following link:" |
55 |
elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d" |
56 |
elog |
57 |
- if use ssl; then |
58 |
- elog "To start the pop3s server as well, create the following link:" |
59 |
- elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd" |
60 |
- elog |
61 |
- fi |
62 |
fi |
63 |
elog "Additionally, the QMTP and QMQP protocols are supported, " |
64 |
elog "and can be started as:" |
65 |
|
66 |
diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild |
67 |
index e1f204048728..b97074ac9ce7 100644 |
68 |
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild |
69 |
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild |
70 |
@@ -1,4 +1,4 @@ |
71 |
-# Copyright 1999-2020 Gentoo Authors |
72 |
+# Copyright 1999-2022 Gentoo Authors |
73 |
# Distributed under the terms of the GNU General Public License v2 |
74 |
|
75 |
EAPI=7 |
76 |
@@ -67,9 +67,6 @@ RDEPEND="${DEPEND} |
77 |
virtual/checkpassword |
78 |
virtual/daemontools |
79 |
authcram? ( >=net-mail/cmd5checkpw-0.30 ) |
80 |
- ssl? ( |
81 |
- pop3? ( sys-apps/ucspi-ssl ) |
82 |
- ) |
83 |
!mail-mta/courier |
84 |
!mail-mta/esmtp |
85 |
!mail-mta/exim |
86 |
|
87 |
diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild b/mail-mta/netqmail/netqmail-1.06-r16.ebuild |
88 |
index 3a8a3899566f..eac15c056ce8 100644 |
89 |
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild |
90 |
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild |
91 |
@@ -1,4 +1,4 @@ |
92 |
-# Copyright 1999-2021 Gentoo Authors |
93 |
+# Copyright 1999-2022 Gentoo Authors |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
|
96 |
EAPI=8 |
97 |
@@ -65,9 +65,6 @@ DEPEND=" |
98 |
RDEPEND="${DEPEND} |
99 |
sys-apps/ucspi-tcp |
100 |
authcram? ( >=net-mail/cmd5checkpw-0.30 ) |
101 |
- ssl? ( |
102 |
- pop3? ( sys-apps/ucspi-ssl ) |
103 |
- ) |
104 |
!mail-mta/courier |
105 |
!mail-mta/esmtp |
106 |
!mail-mta/exim |
107 |
|
108 |
diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild |
109 |
index 9717aa7f830d..e46c90306906 100644 |
110 |
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild |
111 |
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild |
112 |
@@ -78,9 +78,6 @@ RDEPEND="${DEPEND} |
113 |
acct-user/qmailr |
114 |
acct-user/qmails |
115 |
sys-apps/ucspi-tcp |
116 |
- ssl? ( |
117 |
- pop3? ( sys-apps/ucspi-ssl ) |
118 |
- ) |
119 |
!mail-mta/courier |
120 |
!mail-mta/esmtp |
121 |
!mail-mta/exim |
122 |
|
123 |
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild |
124 |
index 8e5a4d4b1b99..55cc84b9f590 100644 |
125 |
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild |
126 |
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild |
127 |
@@ -89,9 +89,6 @@ RDEPEND="${DEPEND} |
128 |
acct-user/qmailr |
129 |
acct-user/qmails |
130 |
sys-apps/ucspi-tcp |
131 |
- ssl? ( |
132 |
- pop3? ( sys-apps/ucspi-ssl ) |
133 |
- ) |
134 |
!mail-mta/courier |
135 |
!mail-mta/esmtp |
136 |
!mail-mta/exim |
137 |
|
138 |
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild |
139 |
index f07147afa4d4..3b797f2022b1 100644 |
140 |
--- a/mail-mta/notqmail/notqmail-9999.ebuild |
141 |
+++ b/mail-mta/notqmail/notqmail-9999.ebuild |
142 |
@@ -86,9 +86,6 @@ RDEPEND="${DEPEND} |
143 |
acct-user/qmailr |
144 |
acct-user/qmails |
145 |
sys-apps/ucspi-tcp |
146 |
- ssl? ( |
147 |
- pop3? ( sys-apps/ucspi-ssl ) |
148 |
- ) |
149 |
!mail-mta/courier |
150 |
!mail-mta/esmtp |
151 |
!mail-mta/exim |