1 |
Author: ulm |
2 |
Date: 2009-04-30 06:55:25 +0000 (Thu, 30 Apr 2009) |
3 |
New Revision: 521 |
4 |
|
5 |
Removed: |
6 |
trunk/man/mailer.eselect.5 |
7 |
trunk/modules/mailer.eselect |
8 |
Modified: |
9 |
trunk/ChangeLog |
10 |
trunk/NEWS |
11 |
trunk/man/Makefile.am |
12 |
trunk/modules/Makefile.am |
13 |
Log: |
14 |
Remove mailer module since it's not functional, bug 220473. |
15 |
|
16 |
Modified: trunk/ChangeLog |
17 |
=================================================================== |
18 |
--- trunk/ChangeLog 2009-04-29 20:01:28 UTC (rev 520) |
19 |
+++ trunk/ChangeLog 2009-04-30 06:55:25 UTC (rev 521) |
20 |
@@ -1,3 +1,12 @@ |
21 |
+2009-04-30 Ulrich Mueller <ulm@g.o> |
22 |
+ |
23 |
+ * modules/mailer.eselect: |
24 |
+ * man/mailer.eselect.5: The mailer module is no longer supported |
25 |
+ by MTA packages and therefore not functional, see bug 220473. |
26 |
+ Remove the module and its man page. |
27 |
+ * modules/Makefile.am (safe_scripts): |
28 |
+ * man/Makefile.am (man_MANS): Update Makefiles accordingly. |
29 |
+ |
30 |
2009-04-28 Ulrich Mueller <ulm@g.o> |
31 |
|
32 |
* modules/mailer.eselect (do_list): Highlight selected target, |
33 |
|
34 |
Modified: trunk/NEWS |
35 |
=================================================================== |
36 |
--- trunk/NEWS 2009-04-29 20:01:28 UTC (rev 520) |
37 |
+++ trunk/NEWS 2009-04-30 06:55:25 UTC (rev 521) |
38 |
@@ -6,7 +6,6 @@ |
39 |
- Fixed bug #155814: Clear aliases and shell functions. |
40 |
- Fixed bug #156866: Handle missing scripts in rc module. |
41 |
- Fixed bug #180966: Make rc module work with OpenRC. |
42 |
- - Fixed bug #220473: Highlight selected target in mailer module. |
43 |
- Various improvements in opengl module. |
44 |
|
45 |
New features: |
46 |
@@ -15,6 +14,7 @@ |
47 |
- Treat 'help' and 'version' options as if they were actions. |
48 |
- Modules for the EDITOR, VISUAL, and PAGER environment variables. |
49 |
- Module news-tng.eselect for reading Gentoo ('GLEP 42') news. |
50 |
+ - Remove mailer module since it's not functional (bug #220473). |
51 |
|
52 |
1.0.12: |
53 |
Bug fixes: |
54 |
|
55 |
Modified: trunk/man/Makefile.am |
56 |
=================================================================== |
57 |
--- trunk/man/Makefile.am 2009-04-29 20:01:28 UTC (rev 520) |
58 |
+++ trunk/man/Makefile.am 2009-04-30 06:55:25 UTC (rev 521) |
59 |
@@ -4,7 +4,6 @@ |
60 |
editor.eselect.5 \ |
61 |
env.eselect.5 \ |
62 |
kernel.eselect.5 \ |
63 |
- mailer.eselect.5 \ |
64 |
news-tng.eselect.5 \ |
65 |
pager.eselect.5 \ |
66 |
profile.eselect.5 \ |
67 |
|
68 |
Deleted: trunk/man/mailer.eselect.5 |
69 |
=================================================================== |
70 |
--- trunk/man/mailer.eselect.5 2009-04-29 20:01:28 UTC (rev 520) |
71 |
+++ trunk/man/mailer.eselect.5 2009-04-30 06:55:25 UTC (rev 521) |
72 |
@@ -1,57 +0,0 @@ |
73 |
-.\" Copyright 2005-2009 Gentoo Foundation |
74 |
-.\" Distributed under the terms of the GNU General Public License v2 |
75 |
-.\" $Id$ |
76 |
-.\" |
77 |
-.TH mailer.eselect 5 "April 2009" "Gentoo Linux" eselect |
78 |
-.SH NAME |
79 |
-mailer.eselect \- The mailer profile management module for Gentoo's eselect |
80 |
-.SH SYNOPSIS |
81 |
-.B eselect mailer |
82 |
-.RB [ help | usage | version ] |
83 |
-.br |
84 |
-.B eselect mailer list |
85 |
-.br |
86 |
-.B eselect mailer set |
87 |
-.I profile |
88 |
-.br |
89 |
-.B eselect mailer show |
90 |
-.br |
91 |
-.SH DESCRIPTION |
92 |
-.B eselect |
93 |
-is Gentoo's configuration and management tool. It features modules |
94 |
-that care for the individual administrative tasks. |
95 |
-.SH ACTION: LIST |
96 |
-.B eselect mailer list |
97 |
-.br |
98 |
-Display an ordered list of the installed mailer profiles. Each line |
99 |
-has a number, the profile's name and version number. |
100 |
- |
101 |
-# eselect mailer list |
102 |
-.br |
103 |
-Available mailer.conf profiles: |
104 |
- [1] default |
105 |
- [2] msmtp\-1.4.0 |
106 |
- [3] nbsmtp\-0.98 |
107 |
-.SH ACTION: SET |
108 |
-.B eselect mailer set |
109 |
-.I profile |
110 |
-.br |
111 |
-Set your system's currently active mailer to |
112 |
-.IR profile . |
113 |
- |
114 |
-# eselect mailer set msmtp-1.4.0 |
115 |
-.SH ACTION: SHOW |
116 |
-.B eselect mailer show |
117 |
-.br |
118 |
-Show your system's mailer profiles. |
119 |
- |
120 |
-# eselect mailer show |
121 |
-.br |
122 |
-Current mailer.conf profile: |
123 |
- msmtp-1.4.0 |
124 |
-.SH AUTHOR |
125 |
-Tom Martin <slarti@g.o> |
126 |
-.SH SEE ALSO |
127 |
-.BR eselect (1) |
128 |
-.SH REVISION |
129 |
-$Id$ |
130 |
|
131 |
Modified: trunk/modules/Makefile.am |
132 |
=================================================================== |
133 |
--- trunk/modules/Makefile.am 2009-04-29 20:01:28 UTC (rev 520) |
134 |
+++ trunk/modules/Makefile.am 2009-04-30 06:55:25 UTC (rev 521) |
135 |
@@ -6,7 +6,6 @@ |
136 |
editor.eselect \ |
137 |
env.eselect \ |
138 |
kernel.eselect \ |
139 |
- mailer.eselect \ |
140 |
modules.eselect \ |
141 |
news-tng.eselect \ |
142 |
pager.eselect \ |
143 |
|
144 |
Deleted: trunk/modules/mailer.eselect |
145 |
=================================================================== |
146 |
--- trunk/modules/mailer.eselect 2009-04-29 20:01:28 UTC (rev 520) |
147 |
+++ trunk/modules/mailer.eselect 2009-04-30 06:55:25 UTC (rev 521) |
148 |
@@ -1,132 +0,0 @@ |
149 |
-# Copyright 1999-2009 Gentoo Foundation |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
-# $Id$ |
152 |
- |
153 |
-DESCRIPTION="Manage the mailwrapper profiles in /etc/mail" |
154 |
-MAINTAINER="slarti@g.o" |
155 |
-SVN_DATE='$Date$' |
156 |
-VERSION=$(svn_date_to_version "${SVN_DATE}") |
157 |
- |
158 |
-# check we have /etc/mail |
159 |
-check_dirs() { |
160 |
- if [[ ! -d ${ROOT}/etc/mail ]] ; then |
161 |
- die -q "/etc/mail does not exist, or is not a directory. Please fix." |
162 |
- fi |
163 |
-} |
164 |
- |
165 |
-# find a list of mailer.conf symlink targets |
166 |
-find_targets() { |
167 |
- check_dirs |
168 |
- for f in ${ROOT}/etc/mail/*.mailer ; do |
169 |
- [[ -e ${f} ]] || continue |
170 |
- echo ${f##*/} |
171 |
- done |
172 |
-} |
173 |
- |
174 |
-# try to remove the mailer.conf symlink |
175 |
-remove_symlink() { |
176 |
- check_dirs |
177 |
- rm "${ROOT}/etc/mail/mailer.conf" |
178 |
-} |
179 |
- |
180 |
-# set the mailer.conf symlink |
181 |
-set_symlink() { |
182 |
- check_dirs |
183 |
- target=${1} |
184 |
- if is_number "${target}" ; then |
185 |
- targets=( $(find_targets ) ) |
186 |
- target=${targets[$(( ${target} - 1 ))]%.mailer} |
187 |
- fi |
188 |
- if [[ -z ${target} ]] ; then |
189 |
- die -q "Target \"${1}\" doesn't appear to be valid!" |
190 |
- elif [[ -f "${ROOT}/etc/mail/${target}.mailer" ]] ; then |
191 |
- pushd "${ROOT}/etc/mail" 1>/dev/null |
192 |
- ln -s "${target}.mailer" "mailer.conf" |
193 |
- popd 1>/dev/null |
194 |
- else |
195 |
- die -q "Target \"${1}\" doesn't appear to be valid!" |
196 |
- fi |
197 |
-} |
198 |
- |
199 |
-### show action ### |
200 |
- |
201 |
-describe_show() { |
202 |
- echo "Show the current mailer.conf profile" |
203 |
-} |
204 |
- |
205 |
-do_show() { |
206 |
- check_dirs |
207 |
- write_list_start "Current mailer.conf profile:" |
208 |
- if [[ -L "${ROOT}/etc/mail/mailer.conf" ]] ; then |
209 |
- profile="$(canonicalise ${ROOT}/etc/mail/mailer.conf )" |
210 |
- write_kv_list_entry "${profile%.mailer}" "" |
211 |
- elif [[ -e "${ROOT}/etc/mail/mailer.conf" ]] ; then |
212 |
- write_kv_list_entry "(not a symlink)" "" |
213 |
- else |
214 |
- write_kv_list_entry "(unset)" "" |
215 |
- fi |
216 |
-} |
217 |
- |
218 |
-### list action ### |
219 |
- |
220 |
-describe_list() { |
221 |
- echo "List available mailer.conf profiles" |
222 |
-} |
223 |
- |
224 |
-do_list() { |
225 |
- check_dirs |
226 |
- targets=( $(find_targets ) ) |
227 |
- targets=( ${targets[@]%.mailer} ) |
228 |
- write_list_start "Available mailer.conf profiles:" |
229 |
- if [[ -n ${targets[@]} ]] ; then |
230 |
- local i |
231 |
- for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do |
232 |
- # any more elegant way to do this? |
233 |
- local profile |
234 |
- profile=$(basename \ |
235 |
- "$(canonicalise "${ROOT}/etc/mail/mailer.conf")") |
236 |
- [[ ${targets[i]} = ${profile%.mailer} ]] \ |
237 |
- && targets[i]="${targets[i]} $(highlight '*')" |
238 |
- done |
239 |
- write_numbered_list "${targets[@]}" |
240 |
- else |
241 |
- write_kv_list_entry "(none found)" "" |
242 |
- fi |
243 |
-} |
244 |
- |
245 |
-### set action ### |
246 |
- |
247 |
-describe_set() { |
248 |
- echo "Set a new mailer.conf profile" |
249 |
-} |
250 |
- |
251 |
-describe_set_parameters() { |
252 |
- echo "<target>" |
253 |
-} |
254 |
- |
255 |
-describe_set_options() { |
256 |
- echo "target : Target name or number (from 'list' action)" |
257 |
-} |
258 |
- |
259 |
-do_set() { |
260 |
- check_dirs |
261 |
- if [[ -z ${1} ]] ; then |
262 |
- die -q "You didn't tell me what to set the profile to" |
263 |
- |
264 |
- elif [[ -L "${ROOT}/etc/mail/mailer.conf" ]] ; then |
265 |
- if ! remove_symlink ; then |
266 |
- die -q "Couldn't remove existing mailer.conf" |
267 |
- elif ! set_symlink "${1}" ; then |
268 |
- die -q "Couldn't set a new profile" |
269 |
- fi |
270 |
- |
271 |
- elif [[ -e "${ROOT}/etc/mail/mailer.conf" ]] ; then |
272 |
- # we have something strange |
273 |
- die -q "Sorry, ${ROOT}/etc/mail/mailer.conf confuses me" |
274 |
- |
275 |
- else |
276 |
- set_symlink "${1}" || die -q "Couldn't set a new symlink" |
277 |
- fi |
278 |
-} |
279 |
- |
280 |
-# vim: set ft=eselect : |