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