/[smecontribs]/rpms/smeserver-mailman/contribs7/smeserver-mailman-1.3.0-relocate.patch
ViewVC logotype

Annotation of /rpms/smeserver-mailman/contribs7/smeserver-mailman-1.3.0-relocate.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.3 - (hide annotations) (download)
Tue Nov 25 16:20:24 2008 UTC (16 years ago) by slords
Branch: MAIN
CVS Tags: smeserver-mailman-1_3_0-37_el4_sme, smeserver-mailman-1_3_0-29_el4_sme, smeserver-mailman-1_3_0-28_el4_sme, smeserver-mailman-1_3_0-27_el4_sme, smeserver-mailman-1_3_0-36_el4_sme, smeserver-mailman-1_3_0-34_el4_sme, HEAD
Changes since 1.2: +0 -0 lines
Restore

1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist
2     --- smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist 2005-10-25 09:50:42.000000000 +1000
3     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-addlist 2005-10-25 10:00:46.337532976 +1000
4     @@ -34,7 +34,7 @@
5     tie %conf, 'esmith::config';
6    
7     my %accounts;
8     -tie %accounts, 'esmith::config', '/home/e-smith/accounts';
9     +tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
10    
11     my $listName = $ARGV [1];
12     my $domain = $ARGV [2];
13     @@ -48,7 +48,7 @@
14    
15     my $cookedListName = $listName;
16     $cookedListName =~ s/\./:/g;
17     -my $alias = "/opt/mailman/aliases/.qmail-$listName";
18     +my $alias = "/usr/lib/mailman/aliases/.qmail-$listName";
19    
20     my %queues = ("", "post",
21     "-admin", "admin",
22     @@ -65,7 +65,7 @@
23     while(my ($tail,$que) = each(%queues))
24     {
25     open(ALIAS, "> $alias$tail") or die "Cannot open $alias. $!\n";
26     - print ALIAS "| /var/qmail/bin/preline /opt/mailman/mail/mailman $que $listName\n";
27     + print ALIAS "| /var/qmail/bin/preline /usr/lib/mailman/mail/mailman $que $listName\n";
28     close ALIAS or die "Cannot close $alias. $!\n";
29     chown(41,41,"$alias$tail");
30     }
31     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf
32     --- smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf 2005-02-16 15:02:25.000000000 +1100
33     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-conf 2005-10-25 09:59:39.517954322 +1000
34     @@ -12,16 +12,16 @@
35     use warnings;
36     use esmith::templates;
37    
38     -my $outfile = '/opt/mailman/Mailman/mm_cfg.py';
39     +my $outfile = '/usr/lib/mailman/Mailman/mm_cfg.py';
40    
41     esmith::templates::processTemplate({
42     TEMPLATE_PATH => $outfile
43     });
44    
45     # If this is a new install, call post-install to set things up.
46     -unless ( -d '/opt/mailman/lists/mailman' )
47     +unless ( -d '/usr/lib/mailman/lists/mailman' )
48     {
49     - system('/opt/mailman/bin/post-install');
50     + system('/usr/lib/mailman/bin/post-install');
51     }
52    
53     exit 0;
54     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist
55     --- smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist 2005-02-14 12:52:31.000000000 +1100
56     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/events/actions/mailman-rmlist 2005-10-25 10:00:46.337532976 +1000
57     @@ -34,7 +34,7 @@
58     tie %conf, 'esmith::config';
59    
60     my %accounts;
61     -tie %accounts, 'esmith::config', '/home/e-smith/accounts';
62     +tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
63    
64     my $listName = $ARGV [1];
65    
66     @@ -43,7 +43,7 @@
67     my $listStatus = db_get_type(\%accounts, $listName);
68     db_delete(\%accounts, $listName) if ($listStatus && $listStatus eq "mailmanlist");
69    
70     -my $alias = "/opt/mailman/aliases/.qmail-$listName";
71     +my $alias = "/usr/lib/mailman/aliases/.qmail-$listName";
72    
73     my %queues = ("", "post",
74     "-admin", "admin",
75     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias
76     --- smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias 2005-02-14 12:52:31.000000000 +1100
77     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86mailmanAlias 2005-10-25 09:59:39.517954322 +1000
78     @@ -1,4 +1,4 @@
79     -Alias /mailman/public /opt/mailman/archives/public
80     -ScriptAlias /mailman /opt/mailman/cgi-bin
81     +Alias /mailman/public /usr/lib/mailman/archives/public
82     +ScriptAlias /mailman /usr/lib/mailman/cgi-bin
83     RedirectMatch ^/mailman[/]*$ /mailman/listinfo
84    
85     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman
86     --- smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman 2005-02-14 12:52:31.000000000 +1100
87     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess90mailman 2005-10-25 09:59:39.517954322 +1000
88     @@ -2,7 +2,7 @@
89     # mailman directories
90     #------------------------------------------------------------
91    
92     -<Directory /opt/mailman/cgi-bin>
93     +<Directory /usr/lib/mailman/cgi-bin>
94     Options ExecCGI
95     AllowOverride None
96     order deny,allow
97     @@ -10,7 +10,7 @@
98     allow from all
99     </Directory>
100    
101     -<Directory /opt/mailman/archives/public>
102     +<Directory /usr/lib/mailman/archives/public>
103     Options Indexes Includes FollowSymLinks
104     order deny,allow
105     deny from all
106     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver
107     --- smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver 2005-02-14 12:52:31.000000000 +1100
108     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/opt/mailman/Mailman/mm_cfg.py/40archiver 2005-10-25 09:59:39.517954322 +1000
109     @@ -1,11 +1,11 @@
110     {
111     $OUT = "";
112     - if( -x "/opt/mailman/mhonarc/filter")
113     + if( -x "/usr/lib/mailman/mhonarc/filter")
114     {
115     - $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
116     - $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
117     - $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
118     - $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/opt/mailman/mhonarc/filter %(listname)s'\n";
119     + $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
120     + $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
121     + $OUT .= "PUBLIC_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
122     + $OUT .= "PRIVATE_EXTERNAL_ARCHIVER = '/usr/lib/mailman/mhonarc/filter %(listname)s'\n";
123     }
124     else
125     {
126     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists
127     --- smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists 2005-02-14 12:52:31.000000000 +1100
128     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/etc/e-smith/templates/var/qmail/users/assign/90mailmanlists 2005-10-25 10:00:46.337532976 +1000
129     @@ -8,7 +8,7 @@
130     # by ~mailman/aliases/.qmail-listname and ~mailman/aliases/.qmail-listname-ext.
131    
132     my %accounts;
133     - tie %accounts, 'esmith::config', "/home/e-smith/accounts";
134     + tie %accounts, 'esmith::config', "/home/e-smith/db/accounts";
135    
136     my (undef, undef, $uid, $gid, undef, undef, undef, $dir, undef)
137     = getpwnam("mailman");
138     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install
139     --- smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install 2005-10-25 09:50:42.000000000 +1000
140     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/post-install 1970-01-01 10:00:00.000000000 +1000
141     @@ -1,33 +0,0 @@
142     -#!/bin/bash
143     -
144     -echo " "
145     -DOMAIN=`/sbin/e-smith/config get DomainName`
146     -if [ ! -d /opt/mailman/lists/mailman ]; then
147     - MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
148     - LENGTH="8"
149     - while [ "${n:=1}" -le "$LENGTH" ]; do
150     - PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
151     - let n+=1
152     - done
153     - echo "* New site password: $PASS"
154     - /sbin/e-smith/config setprop mailman SitePass $PASS
155     -
156     - /opt/mailman/bin/mmsitepass "$PASS" > /dev/null 2>&1 || :
157     - /opt/mailman/bin/newlist -q mailman admin@${DOMAIN} dummypass > /dev/null 2>&1 || :
158     - cat > /tmp/hide << EOF
159     -advertised = 0
160     -archive_private = 1
161     -description = 'Mailman Mailing List'
162     -EOF
163     - /opt/mailman/bin/config_list -i /tmp/hide mailman > /dev/null 2>&1 || :
164     - rm -f /tmp/hide
165     - echo -n "* "
166     - /opt/mailman/bin/change_pw -l mailman 2> /dev/null || echo "New mailman password: *UNCHANGED*"; :
167     - "/opt/mailman/bin/add_members -r - -a n mailman << EOF
168     - admin@${DOMAIN}
169     -EOF" > /dev/null 2>&1 || :
170     -else
171     - /etc/e-smith/events/actions/email-assign || :
172     -fi
173     -/etc/e-smith/events/actions/conf-httpd mailman-install
174     -/etc/e-smith/events/actions/restart-httpd-graceful
175     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist
176     --- smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist 2005-02-14 12:52:31.000000000 +1100
177     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/bin/smelist 1970-01-01 10:00:00.000000000 +1000
178     @@ -1,23 +0,0 @@
179     -#!/usr/bin/perl -wT
180     -
181     -package esmith;
182     -use strict;
183     -use esmith::util;
184     -
185     -my $usage = "$0 is not meant to be called from the command line.
186     -";
187     -
188     -my ($event, $list) = @ARGV;
189     -die $usage unless $event;
190     -die $usage unless $list;
191     -
192     -BEGIN
193     -{
194     - $ENV {'PATH'} = '';
195     - $ENV {'SHELL'} = '/bin/bash';
196     - delete $ENV {'ENV'};
197     -}
198     -
199     -esmith::util::setRealToEffective ();
200     -system ("/sbin/e-smith/signal-event", "mailman-$event", "$list") == 0
201     - or die ("Error occurred while modifying mailman list $list.\n");
202     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py
203     --- smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py 2005-02-14 12:52:31.000000000 +1100
204     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/opt/mailman/Mailman/MTA/SME.py 1970-01-01 10:00:00.000000000 +1000
205     @@ -1,55 +0,0 @@
206     -# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
207     -#
208     -# This program is free software; you can redistribute it and/or
209     -# modify it under the terms of the GNU General Public License
210     -# as published by the Free Software Foundation; either version 2
211     -# of the License, or (at your option) any later version.
212     -#
213     -# This program is distributed in the hope that it will be useful,
214     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
215     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
216     -# GNU General Public License for more details.
217     -#
218     -# You should have received a copy of the GNU General Public License
219     -# along with this program; if not, write to the Free Software
220     -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
221     -
222     -"""Creation/deletion hooks for the SME and Q-Mail
223     -"""
224     -
225     -import os
226     -import time
227     -import errno
228     -import pwd
229     -from stat import *
230     -
231     -from Mailman import mm_cfg
232     -from Mailman import Utils
233     -from Mailman import LockFile
234     -from Mailman.i18n import _
235     -from Mailman.MTA.Utils import makealiases
236     -from Mailman.Logging.Syslog import syslog
237     -
238     -
239     -
240     -def create(mlist, cgi=0, nolock=0):
241     - listname = mlist.internal_name()
242     - msg = 'command failed: %s (status: %s, %s)'
243     - acmd = '/opt/mailman/bin/smelist addlist ' + listname
244     - status = (os.system(acmd) >> 8) & 0xff
245     - if status:
246     - errstr = os.strerror(status)
247     - syslog('error', msg, acmd, status, errstr)
248     - raise RuntimeError, msg % (acmd, status, errstr)
249     -
250     -
251     -
252     -def remove(mlist, cgi=0):
253     - listname = mlist.internal_name()
254     - msg = 'command failed: %s (status: %s, %s)'
255     - acmd = '/opt/mailman/bin/smelist rmlist ' + listname
256     - status = (os.system(acmd) >> 8) & 0xff
257     - if status:
258     - errstr = os.strerror(status)
259     - syslog('error', msg, acmd, status, errstr)
260     - raise RuntimeError, msg % (acmd, status, errstr)
261     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install
262     --- smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install 1970-01-01 10:00:00.000000000 +1000
263     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/post-install 2005-10-25 09:59:39.517954322 +1000
264     @@ -0,0 +1,33 @@
265     +#!/bin/bash
266     +
267     +echo " "
268     +DOMAIN=`/sbin/e-smith/config get DomainName`
269     +if [ ! -d /usr/lib/mailman/lists/mailman ]; then
270     + MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
271     + LENGTH="8"
272     + while [ "${n:=1}" -le "$LENGTH" ]; do
273     + PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
274     + let n+=1
275     + done
276     + echo "* New site password: $PASS"
277     + /sbin/e-smith/config setprop mailman SitePass $PASS
278     +
279     + /usr/lib/mailman/bin/mmsitepass "$PASS" > /dev/null 2>&1 || :
280     + /usr/lib/mailman/bin/newlist -q mailman admin@${DOMAIN} dummypass > /dev/null 2>&1 || :
281     + cat > /tmp/hide << EOF
282     +advertised = 0
283     +archive_private = 1
284     +description = 'Mailman Mailing List'
285     +EOF
286     + /usr/lib/mailman/bin/config_list -i /tmp/hide mailman > /dev/null 2>&1 || :
287     + rm -f /tmp/hide
288     + echo -n "* "
289     + /usr/lib/mailman/bin/change_pw -l mailman 2> /dev/null || echo "New mailman password: *UNCHANGED*"; :
290     + "/usr/lib/mailman/bin/add_members -r - -a n mailman << EOF
291     + admin@${DOMAIN}
292     +EOF" > /dev/null 2>&1 || :
293     +else
294     + /etc/e-smith/events/actions/email-assign || :
295     +fi
296     +/etc/e-smith/events/actions/conf-httpd mailman-install
297     +/etc/e-smith/events/actions/restart-httpd-graceful
298     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist
299     --- smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist 1970-01-01 10:00:00.000000000 +1000
300     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/bin/smelist 2005-02-14 12:52:31.000000000 +1100
301     @@ -0,0 +1,23 @@
302     +#!/usr/bin/perl -wT
303     +
304     +package esmith;
305     +use strict;
306     +use esmith::util;
307     +
308     +my $usage = "$0 is not meant to be called from the command line.
309     +";
310     +
311     +my ($event, $list) = @ARGV;
312     +die $usage unless $event;
313     +die $usage unless $list;
314     +
315     +BEGIN
316     +{
317     + $ENV {'PATH'} = '';
318     + $ENV {'SHELL'} = '/bin/bash';
319     + delete $ENV {'ENV'};
320     +}
321     +
322     +esmith::util::setRealToEffective ();
323     +system ("/sbin/e-smith/signal-event", "mailman-$event", "$list") == 0
324     + or die ("Error occurred while modifying mailman list $list.\n");
325     diff -Nur -x '*.orig' -x '*.rej' smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py
326     --- smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py 1970-01-01 10:00:00.000000000 +1000
327     +++ mezzanine_patched_smeserver-mailman-1.3.0/root/usr/lib/mailman/Mailman/MTA/SME.py 2005-10-25 09:59:39.516954493 +1000
328     @@ -0,0 +1,55 @@
329     +# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
330     +#
331     +# This program is free software; you can redistribute it and/or
332     +# modify it under the terms of the GNU General Public License
333     +# as published by the Free Software Foundation; either version 2
334     +# of the License, or (at your option) any later version.
335     +#
336     +# This program is distributed in the hope that it will be useful,
337     +# but WITHOUT ANY WARRANTY; without even the implied warranty of
338     +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
339     +# GNU General Public License for more details.
340     +#
341     +# You should have received a copy of the GNU General Public License
342     +# along with this program; if not, write to the Free Software
343     +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
344     +
345     +"""Creation/deletion hooks for the SME and Q-Mail
346     +"""
347     +
348     +import os
349     +import time
350     +import errno
351     +import pwd
352     +from stat import *
353     +
354     +from Mailman import mm_cfg
355     +from Mailman import Utils
356     +from Mailman import LockFile
357     +from Mailman.i18n import _
358     +from Mailman.MTA.Utils import makealiases
359     +from Mailman.Logging.Syslog import syslog
360     +
361     +
362     +
363     +def create(mlist, cgi=0, nolock=0):
364     + listname = mlist.internal_name()
365     + msg = 'command failed: %s (status: %s, %s)'
366     + acmd = '/usr/lib/mailman/bin/smelist addlist ' + listname
367     + status = (os.system(acmd) >> 8) & 0xff
368     + if status:
369     + errstr = os.strerror(status)
370     + syslog('error', msg, acmd, status, errstr)
371     + raise RuntimeError, msg % (acmd, status, errstr)
372     +
373     +
374     +
375     +def remove(mlist, cgi=0):
376     + listname = mlist.internal_name()
377     + msg = 'command failed: %s (status: %s, %s)'
378     + acmd = '/usr/lib/mailman/bin/smelist rmlist ' + listname
379     + status = (os.system(acmd) >> 8) & 0xff
380     + if status:
381     + errstr = os.strerror(status)
382     + syslog('error', msg, acmd, status, errstr)
383     + raise RuntimeError, msg % (acmd, status, errstr)

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed