1 |
The split in the install functions was needed for packages like miniqmail, that |
2 |
only installed a subset of the functions. It has meanwhile been removed from |
3 |
tree. |
4 |
|
5 |
In turn notqmail is going to drop some obsolete programs from the installation. |
6 |
Most documentation files also have been renamed to *.md. |
7 |
|
8 |
Signed-off-by: Rolf Eike Beer <eike@×××××××.de> |
9 |
--- |
10 |
eclass/qmail.eclass | 54 ++++++++++++++++++++++----------------------- |
11 |
1 file changed, 26 insertions(+), 28 deletions(-) |
12 |
|
13 |
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass |
14 |
index a78c118c89e..21f317fd34a 100644 |
15 |
--- a/eclass/qmail.eclass |
16 |
+++ b/eclass/qmail.eclass |
17 |
@@ -117,8 +117,7 @@ qmail_spp_src_unpack() { |
18 |
|
19 |
# @FUNCTION: qmail_src_postunpack |
20 |
# @DESCRIPTION: |
21 |
-# Unpack common config files, apply custom patches if supplied and |
22 |
-# set built configuration (CFLAGS, LDFLAGS, etc) |
23 |
+# Unpack common config files, and set built configuration (CFLAGS, LDFLAGS, etc) |
24 |
qmail_src_postunpack() { |
25 |
cd "${S}" |
26 |
|
27 |
@@ -144,33 +143,27 @@ qmail_base_install() { |
28 |
einfo "Setting up basic directory hierarchy" |
29 |
diropts -o root -g qmail -m 755 |
30 |
keepdir "${QMAIL_HOME}"/{,bin,control} |
31 |
- |
32 |
- einfo "Installing basic qmail software" |
33 |
- insinto "${QMAIL_HOME}"/bin |
34 |
- |
35 |
- insopts -o root -g qmail -m 755 |
36 |
- doins datemail elq forward maildir2mbox maildirmake \ |
37 |
- maildirwatch mailsubj pinq predate qail \ |
38 |
- qmail-{inject,qmqpc,showctl} sendmail |
39 |
- |
40 |
- einfo "Adding env.d entry for qmail" |
41 |
- doenvd "${GENQMAIL_S}"/conf/99qmail |
42 |
- |
43 |
- declare -F qmail_base_install_hook >/dev/null && \ |
44 |
- qmail_base_install_hook |
45 |
-} |
46 |
- |
47 |
-qmail_full_install() { |
48 |
- einfo "Setting up full directory hierarchy" |
49 |
keepdir "${QMAIL_HOME}"/users |
50 |
diropts -o alias -g qmail -m 755 |
51 |
keepdir "${QMAIL_HOME}"/alias |
52 |
|
53 |
+ einfo "Adding env.d entry for qmail" |
54 |
+ doenvd "${GENQMAIL_S}"/conf/99qmail |
55 |
+ |
56 |
einfo "Installing all qmail software" |
57 |
+ insinto "${QMAIL_HOME}"/bin |
58 |
+ |
59 |
insopts -o root -g qmail -m 755 |
60 |
- doins bouncesaying condredirect config-fast except preline qbiff \ |
61 |
- qmail-{qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \ |
62 |
- qreceipt qsmhook tcp-env |
63 |
+ doins bouncesaying condredirect config-fast datemail except forward maildir2mbox \ |
64 |
+ maildirmake mailsubj predate preline qbiff \ |
65 |
+ qmail-{inject,qmqpc,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto,showctl} \ |
66 |
+ qreceipt sendmail tcp-env |
67 |
+ |
68 |
+ # obsolete tools, install if they are still present |
69 |
+ for i in elq maildirwatch pinq qail qsmhook; do |
70 |
+ [[ -x ${i} ]] && doins ${i} |
71 |
+ done |
72 |
+ |
73 |
use pop3 && doins qmail-pop3d |
74 |
|
75 |
insopts -o root -g qmail -m 711 |
76 |
@@ -183,8 +176,8 @@ qmail_full_install() { |
77 |
insopts -o qmailq -g qmail -m 4711 |
78 |
doins qmail-queue |
79 |
|
80 |
- declare -F qmail_full_install_hook >/dev/null && \ |
81 |
- qmail_full_install_hook |
82 |
+ declare -F qmail_base_install_hook >/dev/null && \ |
83 |
+ qmail_base_install_hook |
84 |
} |
85 |
|
86 |
qmail_config_install() { |
87 |
@@ -207,8 +200,14 @@ qmail_man_install() { |
88 |
|
89 |
into /usr |
90 |
doman *.[1578] |
91 |
- dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \ |
92 |
- SENDMAIL* TEST* THANKS* THOUGHTS UPGRADE VERSION* |
93 |
+ dodoc BLURB* INSTALL* PIC* README* REMOVE* \ |
94 |
+ SENDMAIL* TEST* THANKS* VERSION* |
95 |
+ # notqmail converted the files to markdown |
96 |
+ if [ -f CHANGES ]; then |
97 |
+ dodoc CHANGES FAQ SECURITY THOUGHTS UPGRADE |
98 |
+ else |
99 |
+ dodoc CHANGES.md FAQ.md SECURITY.md THOUGHTS.md UPGRADE.md |
100 |
+ fi |
101 |
|
102 |
declare -F qmail_man_install_hook >/dev/null && \ |
103 |
qmail_man_install_hook |
104 |
@@ -334,7 +333,6 @@ qmail_ssl_install() { |
105 |
qmail_src_install() { |
106 |
export GROUP_ROOT="$(id -gn root)" |
107 |
qmail_base_install |
108 |
- qmail_full_install |
109 |
qmail_config_install |
110 |
qmail_man_install |
111 |
qmail_sendmail_install |
112 |
-- |
113 |
2.26.2 |