← Back to branch summary

~ubuntu-branches/ubuntu/lucid/spamassassin/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/10_change_config_paths.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville, Ubuntu Merge-o-Matic, Laurent Bigonville
  • Date: 2006-07-31 15:40:08 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060731154008-j37ulp5pgfkddegw
Tags: 3.1.3-1ubuntu1
[ Ubuntu Merge-o-Matic ]
* Merge from debian unstable.

[ Laurent Bigonville ]
* fix debian/control.
* drop debian/patches/40_fix_dns_issue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_change_config_paths.dpatch
24
24
exit 0
25
25
 
26
26
@DPATCH@
27
 
diff -urNad --exclude=CVS --exclude=.svn ./ldap/README /tmp/dpep-work.hAWYqo/spamassassin/ldap/README
28
 
--- ./ldap/README       2005-08-11 20:38:44.000000000 -0400
29
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/ldap/README      2005-08-17 23:46:34.000000000 -0400
 
27
diff -urNad spamassassin~/README spamassassin/README
 
28
--- spamassassin~/README        2006-03-10 14:30:24.000000000 -0500
 
29
+++ spamassassin/README 2006-05-07 16:45:40.000000000 -0400
 
30
@@ -104,13 +104,13 @@
 
31
        Distributed configuration files, with all defaults.  Do not modify
 
32
        these, as they are overwritten when you upgrade.
 
33
 
 
34
-  - /etc/mail/spamassassin/*.cf:
 
35
+  - /etc/spamassassin/*.cf:
 
36
 
 
37
        Site config files, for system admins to create, modify, and
 
38
        add local rules and scores to.  Modifications here will be
 
39
        appended to the config loaded from the above directory.
 
40
 
 
41
-  - /etc/mail/spamassassin/*.pre:
 
42
+  - /etc/spamassassin/*.pre:
 
43
 
 
44
         Plugin control files, installed from the distribution. These are
 
45
         used to control what plugins are loaded.  Modifications here will
 
46
@@ -119,7 +119,7 @@
 
47
         
 
48
         You want to modify these files if you want to load additional
 
49
         plugins, or inhibit loading a plugin that is enabled by default.
 
50
-        If the files exist in /etc/mail/spamassassin, they will not
 
51
+        If the files exist in /etc/spamassassin, they will not
 
52
         be overwritten during future installs.
 
53
 
 
54
   - /usr/share/spamassassin/user_prefs.template:
 
55
@@ -127,14 +127,14 @@
 
56
        Distributed default user preferences. Do not modify this, as it is
 
57
        overwritten when you upgrade.
 
58
 
 
59
-  - /etc/mail/spamassassin/user_prefs.template:
 
60
+  - /etc/spamassassin/user_prefs.template:
 
61
 
 
62
        Default user preferences, for system admins to create, modify, and
 
63
        set defaults for users' preferences files.  Takes precedence over
 
64
        the above prefs file, if it exists.
 
65
 
 
66
         Do not put system-wide settings in here; put them in a file in the
 
67
-        "/etc/mail/spamassassin" directory ending in ".cf". This file is
 
68
+        "/etc/spamassassin" directory ending in ".cf". This file is
 
69
         just a template, which will be copied to a user's home directory
 
70
         for them to change.
 
71
 
 
72
diff -urNad spamassassin~/UPGRADE spamassassin/UPGRADE
 
73
--- spamassassin~/UPGRADE       2006-03-10 14:30:23.000000000 -0500
 
74
+++ spamassassin/UPGRADE        2006-05-07 16:45:40.000000000 -0400
 
75
@@ -8,7 +8,7 @@
 
76
   perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
 
77
 
 
78
 - There are now multiple files read to enable plugins in the
 
79
-  /etc/mail/spamassassin directory; previously only one, "init.pre" was
 
80
+  /etc/spamassassin directory; previously only one, "init.pre" was
 
81
   read.  Now both "init.pre", "v310.pre", and any other files ending
 
82
   in ".pre" will be read.  As future releases are made, new plugins
 
83
   will be added to new files named according to the release they're
 
84
@@ -165,7 +165,7 @@
 
85
 - If you are using a UNIX machine with all database files on local disks,
 
86
   and no sharing of those databases across NFS filesystems, you can use a
 
87
   more efficient, but non-NFS-safe, locking mechanism.   Do this by adding
 
88
-  the line "lock_method flock" to the /etc/mail/spamassassin/local.cf
 
89
+  the line "lock_method flock" to the /etc/spamassassin/local.cf
 
90
   file. This is strongly recommended if you're not using NFS, as it is
 
91
   much faster than the NFS-safe locker.
 
92
 
 
93
diff -urNad spamassassin~/USAGE spamassassin/USAGE
 
94
--- spamassassin~/USAGE 2006-03-10 14:30:24.000000000 -0500
 
95
+++ spamassassin/USAGE  2006-05-07 16:45:40.000000000 -0400
 
96
@@ -116,7 +116,7 @@
 
97
     CPU-intensive task before they can send mail to you, so we give that
 
98
     some bonus points.  However, it requires that you list what addresses
 
99
     you expect to receive mail for, by adding 'hashcash_accept' lines to
 
100
-    your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
 
101
+    your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf
 
102
     files.  See the Mail::SpamAssassin::Plugin::Hashcash manual page for
 
103
     details on how to specify these.
 
104
 
 
105
@@ -128,14 +128,14 @@
 
106
 
 
107
 
 
108
   - You can create your own system-wide rules files in
 
109
-    /etc/mail/spamassassin; their filenames should end in ".cf".  Multiple
 
110
+    /etc/spamassassin; their filenames should end in ".cf".  Multiple
 
111
     files will be read, and SpamAssassin will not overwrite these files
 
112
     when installing a new version.
 
113
 
 
114
 
 
115
   - You should not modify the files in /usr/share/spamassassin; these
 
116
     will be overwritten when you upgrade.  Any changes you make in
 
117
-    files in the /etc/mail/spamassassin directory,  however, will
 
118
+    files in the /etc/spamassassin directory,  however, will
 
119
     override these files.
 
120
 
 
121
 
 
122
diff -urNad spamassassin~/ldap/README spamassassin/ldap/README
 
123
--- spamassassin~/ldap/README   2006-03-10 14:29:49.000000000 -0500
 
124
+++ spamassassin/ldap/README    2006-05-07 16:45:40.000000000 -0400
30
125
@@ -13,7 +13,7 @@
31
126
 database or LDAP server.
32
127
 
36
131
 
37
132
   user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
38
133
   user_scores_ldap_username    bind dn
39
 
diff -urNad --exclude=CVS --exclude=.svn ./lib/Mail/SpamAssassin/Conf.pm /tmp/dpep-work.hAWYqo/spamassassin/lib/Mail/SpamAssassin/Conf.pm
40
 
--- ./lib/Mail/SpamAssassin/Conf.pm     2005-08-11 20:38:47.000000000 -0400
41
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/lib/Mail/SpamAssassin/Conf.pm    2005-08-17 23:46:34.000000000 -0400
 
134
diff -urNad spamassassin~/lib/Mail/SpamAssassin/Conf.pm spamassassin/lib/Mail/SpamAssassin/Conf.pm
 
135
--- spamassassin~/lib/Mail/SpamAssassin/Conf.pm 2006-03-10 14:29:55.000000000 -0500
 
136
+++ spamassassin/lib/Mail/SpamAssassin/Conf.pm  2006-05-07 16:45:40.000000000 -0400
42
137
@@ -39,7 +39,7 @@
43
138
 =head1 DESCRIPTION
44
139
 
48
143
 directories.
49
144
 
50
145
 The C<#> character starts a comment, which continues until end of line.
51
 
@@ -1582,7 +1582,7 @@
 
146
@@ -1590,7 +1590,7 @@
52
147
 
53
148
 These settings differ from the ones above, in that they are considered
54
149
 'privileged'.  Only users running C<spamassassin> from their procmailrc's or
57
152
 use them.   C<spamd> users cannot use them in their C<user_prefs> files, for
58
153
 security and efficiency reasons, unless C<allow_user_rules> is enabled (and
59
154
 then, they may only add rules from below).
60
 
diff -urNad --exclude=CVS --exclude=.svn ./lib/Mail/SpamAssassin/Plugin/Test.pm /tmp/dpep-work.hAWYqo/spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
61
 
--- ./lib/Mail/SpamAssassin/Plugin/Test.pm      2005-08-11 20:38:47.000000000 -0400
62
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm     2005-08-17 23:46:34.000000000 -0400
 
155
diff -urNad spamassassin~/lib/Mail/SpamAssassin/Plugin/Test.pm spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
 
156
--- spamassassin~/lib/Mail/SpamAssassin/Plugin/Test.pm  2006-03-10 14:29:54.000000000 -0500
 
157
+++ spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm   2006-05-07 16:45:40.000000000 -0400
63
158
@@ -26,7 +26,7 @@
64
159
 =head1 DESCRIPTION
65
160
 
69
164
 
70
165
 =cut
71
166
 
72
 
diff -urNad --exclude=CVS --exclude=.svn ./lib/spamassassin-run.pod /tmp/dpep-work.hAWYqo/spamassassin/lib/spamassassin-run.pod
73
 
--- ./lib/spamassassin-run.pod  2005-08-11 20:38:47.000000000 -0400
74
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/lib/spamassassin-run.pod 2005-08-17 23:46:34.000000000 -0400
 
167
diff -urNad spamassassin~/lib/spamassassin-run.pod spamassassin/lib/spamassassin-run.pod
 
168
--- spamassassin~/lib/spamassassin-run.pod      2006-03-10 14:29:55.000000000 -0500
 
169
+++ spamassassin/lib/spamassassin-run.pod       2006-05-07 16:45:40.000000000 -0400
75
170
@@ -43,7 +43,7 @@
76
171
  -p prefs, --prefspath=file, --prefs-file=file
77
172
                                    Set user preferences file
90
185
 
91
186
 =item B<-p> I<prefs>, B<--prefspath>=I<prefs>, B<--prefs-file>=I<prefs>
92
187
 
93
 
diff -urNad --exclude=CVS --exclude=.svn ./README /tmp/dpep-work.hAWYqo/spamassassin/README
94
 
--- ./README    2005-08-11 20:38:58.000000000 -0400
95
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/README   2005-08-17 23:46:34.000000000 -0400
96
 
@@ -79,13 +79,13 @@
97
 
        Distributed configuration files, with all defaults.  Do not modify
98
 
        these, as they are overwritten when you upgrade.
99
 
 
100
 
-  - /etc/mail/spamassassin/*.cf:
101
 
+  - /etc/spamassassin/*.cf:
102
 
 
103
 
        Site config files, for system admins to create, modify, and
104
 
        add local rules and scores to.  Modifications here will be
105
 
        appended to the config loaded from the above directory.
106
 
 
107
 
-  - /etc/mail/spamassassin/*.pre:
108
 
+  - /etc/spamassassin/*.pre:
109
 
 
110
 
         Plugin control files, installed from the distribution. These are
111
 
         used to control what plugins are loaded.  Modifications here will
112
 
@@ -94,7 +94,7 @@
113
 
         
114
 
         You want to modify these files if you want to load additional
115
 
         plugins, or inhibit loading a plugin that is enabled by default.
116
 
-        If the files exist in /etc/mail/spamassassin, they will not
117
 
+        If the files exist in /etc/spamassassin, they will not
118
 
         be overwritten during future installs.
119
 
 
120
 
   - /usr/share/spamassassin/user_prefs.template:
121
 
@@ -102,14 +102,14 @@
122
 
        Distributed default user preferences. Do not modify this, as it is
123
 
        overwritten when you upgrade.
124
 
 
125
 
-  - /etc/mail/spamassassin/user_prefs.template:
126
 
+  - /etc/spamassassin/user_prefs.template:
127
 
 
128
 
        Default user preferences, for system admins to create, modify, and
129
 
        set defaults for users' preferences files.  Takes precedence over
130
 
        the above prefs file, if it exists.
131
 
 
132
 
         Do not put system-wide settings in here; put them in a file in the
133
 
-        "/etc/mail/spamassassin" directory ending in ".cf". This file is
134
 
+        "/etc/spamassassin" directory ending in ".cf". This file is
135
 
         just a template, which will be copied to a user's home directory
136
 
         for them to change.
137
 
 
138
 
diff -urNad --exclude=CVS --exclude=.svn ./rules/30_text_fr.cf /tmp/dpep-work.hAWYqo/spamassassin/rules/30_text_fr.cf
139
 
--- ./rules/30_text_fr.cf       2005-08-11 20:38:50.000000000 -0400
140
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/rules/30_text_fr.cf      2005-08-17 23:46:34.000000000 -0400
 
188
diff -urNad spamassassin~/rules/30_text_fr.cf spamassassin/rules/30_text_fr.cf
 
189
--- spamassassin~/rules/30_text_fr.cf   2006-03-10 14:30:02.000000000 -0500
 
190
+++ spamassassin/rules/30_text_fr.cf    2006-05-07 16:45:40.000000000 -0400
141
191
@@ -4,7 +4,7 @@
142
192
 # Latest revision: 2003/11/14
143
193
 #
147
197
 # See 'perldoc Mail::SpamAssassin::Conf' for details.
148
198
 #
149
199
 # <@LICENSE>
150
 
diff -urNad --exclude=CVS --exclude=.svn ./rules/30_text_pt_br.cf /tmp/dpep-work.hAWYqo/spamassassin/rules/30_text_pt_br.cf
151
 
--- ./rules/30_text_pt_br.cf    2005-08-11 20:38:50.000000000 -0400
152
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/rules/30_text_pt_br.cf   2005-08-17 23:46:34.000000000 -0400
 
200
diff -urNad spamassassin~/rules/30_text_pt_br.cf spamassassin/rules/30_text_pt_br.cf
 
201
--- spamassassin~/rules/30_text_pt_br.cf        2006-03-10 14:30:02.000000000 -0500
 
202
+++ spamassassin/rules/30_text_pt_br.cf 2006-05-07 16:45:40.000000000 -0400
153
203
@@ -4,7 +4,7 @@
154
204
 # Feita por Marcelo Cruzeta ZOE Inform�tica
155
205
 #
159
209
 # Veja 'perldoc Mail::SpamAssassin::Conf' para detalhes.
160
210
 #
161
211
 # Este programa � um software gratuito; voc� pode distribu�-lo e/ou modific�-lo
162
 
diff -urNad --exclude=CVS --exclude=.svn ./rules/user_prefs.template /tmp/dpep-work.hAWYqo/spamassassin/rules/user_prefs.template
163
 
--- ./rules/user_prefs.template 2005-08-11 20:38:50.000000000 -0400
164
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/rules/user_prefs.template        2005-08-17 23:46:34.000000000 -0400
 
212
diff -urNad spamassassin~/rules/user_prefs.template spamassassin/rules/user_prefs.template
 
213
--- spamassassin~/rules/user_prefs.template     2006-03-10 14:30:02.000000000 -0500
 
214
+++ spamassassin/rules/user_prefs.template      2006-05-07 16:45:40.000000000 -0400
165
215
@@ -5,7 +5,7 @@
166
216
 #* directory. At runtime, if a user has no preferences in their home directory
167
217
 #* already, it will be copied for them, allowing them to perform personalised
171
221
 ###########################################################################
172
222
 
173
223
 # How many points before a mail is considered spam.
174
 
diff -urNad --exclude=CVS --exclude=.svn ./sa-learn.raw /tmp/dpep-work.hAWYqo/spamassassin/sa-learn.raw
175
 
--- ./sa-learn.raw      2005-08-11 20:38:58.000000000 -0400
176
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/sa-learn.raw     2005-08-17 23:46:34.000000000 -0400
 
224
diff -urNad spamassassin~/sa-learn.raw spamassassin/sa-learn.raw
 
225
--- spamassassin~/sa-learn.raw  2006-03-10 14:30:23.000000000 -0500
 
226
+++ spamassassin/sa-learn.raw   2006-05-07 16:45:40.000000000 -0400
177
227
@@ -570,7 +570,7 @@
178
228
  -u username, --username=username  Override username taken from the runtime environment
179
229
  -C path, --configpath=path, --config-file=path   Path to standard configuration dir
192
242
 
193
243
 =item B<-p> I<prefs>, B<--prefspath>=I<prefs>, B<--prefs-file>=I<prefs>
194
244
 
195
 
diff -urNad --exclude=CVS --exclude=.svn ./sa-update.raw /tmp/dpep-work.hAWYqo/spamassassin/sa-update.raw
196
 
--- ./sa-update.raw     2005-08-11 20:38:58.000000000 -0400
197
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/sa-update.raw    2005-08-17 23:46:34.000000000 -0400
198
 
@@ -715,7 +715,7 @@
199
 
 
200
 
   --updatedir path             Directory to place updates, defaults to the
201
 
                                SpamAssassin site rules directory (def:
202
 
-                               /etc/mail/spamassassin)
203
 
+                               /etc/spamassassin)
204
 
 
205
 
   --channel channel            Retrieve updates from this channel
206
 
                                Use multiple times for multiple channels
207
 
@@ -749,7 +749,7 @@
208
 
 =item B<updatedir>
209
 
 
210
 
 Typically sa-update will use whatever the default site rules directory
211
 
-SpamAssassin uses.  (usually /etc/mail/spamassassin)  If the updates should be
212
 
+SpamAssassin uses.  (usually /etc/spamassassin)  If the updates should be
213
 
 stored in another location, specify it here.
214
 
 
215
 
 =item B<channel>
216
 
diff -urNad --exclude=CVS --exclude=.svn ./spamc/spamc.pod /tmp/dpep-work.hAWYqo/spamassassin/spamc/spamc.pod
217
 
--- ./spamc/spamc.pod   2005-08-11 20:38:54.000000000 -0400
218
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/spamc/spamc.pod  2005-08-17 23:46:34.000000000 -0400
219
 
@@ -207,7 +207,7 @@
220
 
 C<spamc> will attempt to load defaults as follows.
221
 
 
222
 
 If the installation prefix begins with C</usr>,
223
 
-C</etc/mail/spamassassin/spamc.conf> will be attempted. If it begins with
224
 
+C</etc/spamassassin/spamc.conf> will be attempted. If it begins with
225
 
 C</opt>, C</etc/opt/mail/spamassassin/spamc.conf> will be attempted. If those
226
 
 don't exist, C</etc/spamc.conf> will be appended to the prefix and tried. If
227
 
 none of those exist, no configuration file will be read by default.
228
 
diff -urNad --exclude=CVS --exclude=.svn ./spamd/README /tmp/dpep-work.hAWYqo/spamassassin/spamd/README
229
 
--- ./spamd/README      2004-10-22 21:39:19.000000000 -0400
230
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/spamd/README     2005-08-17 23:46:34.000000000 -0400
 
245
diff -urNad spamassassin~/spamc/spamc.pod spamassassin/spamc/spamc.pod
 
246
--- spamassassin~/spamc/spamc.pod       2006-03-10 14:30:13.000000000 -0500
 
247
+++ spamassassin/spamc/spamc.pod        2006-05-07 16:46:23.000000000 -0400
 
248
@@ -211,8 +211,8 @@
 
249
 
 
250
 If the B<-F> switch is specified, that file will be used.  Otherwise,
 
251
 C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
 
252
-/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>
 
253
-switch is not specified, no configuration file will be read.
 
254
+/etc/spamassassin). If that file doesn't exist, and the B<-F> switch
 
255
+is not specified, no configuration file will be read.
 
256
 
 
257
 Example:
 
258
 
 
259
diff -urNad spamassassin~/spamd/README spamassassin/spamd/README
 
260
--- spamassassin~/spamd/README  2006-03-10 14:30:23.000000000 -0500
 
261
+++ spamassassin/spamd/README   2006-05-07 16:45:40.000000000 -0400
231
262
@@ -105,7 +105,7 @@
232
263
 If you plan to use Bayesian classification (the BAYES rules) with spamd,
233
264
 you will need to either
237
268
   tokens, by setting the 'bayes_path' setting to a path all users can read
238
269
   and write to.  You will also need to set the 'bayes_file_mode' setting
239
270
   to 0666 so that created files are shared, too.
240
 
diff -urNad --exclude=CVS --exclude=.svn ./spamd/README.vpopmail /tmp/dpep-work.hAWYqo/spamassassin/spamd/README.vpopmail
241
 
--- ./spamd/README.vpopmail     2004-10-22 21:39:18.000000000 -0400
242
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/spamd/README.vpopmail    2005-08-17 23:46:34.000000000 -0400
 
271
diff -urNad spamassassin~/spamd/README.vpopmail spamassassin/spamd/README.vpopmail
 
272
--- spamassassin~/spamd/README.vpopmail 2006-03-10 14:30:23.000000000 -0500
 
273
+++ spamassassin/spamd/README.vpopmail  2006-05-07 16:45:40.000000000 -0400
243
274
@@ -43,7 +43,7 @@
244
275
        /home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
245
276
 
249
280
 future enhancement would be to add the capability to have personal AWL db.
250
281
 
251
282
 6. Of course vpopmail must have the seekable patch installed (see 
252
 
diff -urNad --exclude=CVS --exclude=.svn ./spamd/spamd.raw /tmp/dpep-work.hAWYqo/spamassassin/spamd/spamd.raw
253
 
--- ./spamd/spamd.raw   2005-08-11 20:38:58.000000000 -0400
254
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/spamd/spamd.raw  2005-08-17 23:46:34.000000000 -0400
255
 
@@ -2251,7 +2251,7 @@
 
283
diff -urNad spamassassin~/spamd/spamd.raw spamassassin/spamd/spamd.raw
 
284
--- spamassassin~/spamd/spamd.raw       2006-03-10 14:30:23.000000000 -0500
 
285
+++ spamassassin/spamd/spamd.raw        2006-05-07 16:45:40.000000000 -0400
 
286
@@ -2283,7 +2283,7 @@
256
287
 =item B<--siteconfigpath>=I<path>
257
288
 
258
289
 Use the specified path for locating site-specific configuration files.  Ignore
261
292
 
262
293
 =item B<-d>, B<--daemonize>
263
294
 
264
 
diff -urNad --exclude=CVS --exclude=.svn ./sql/README /tmp/dpep-work.hAWYqo/spamassassin/sql/README
265
 
--- ./sql/README        2005-08-11 20:38:53.000000000 -0400
266
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/sql/README       2005-08-17 23:46:34.000000000 -0400
 
295
diff -urNad spamassassin~/sql/README spamassassin/sql/README
 
296
--- spamassassin~/sql/README    2006-03-10 14:30:12.000000000 -0500
 
297
+++ spamassassin/sql/README     2006-05-07 16:45:40.000000000 -0400
267
298
@@ -18,7 +18,7 @@
268
299
 SQL preferences.
269
300
 
273
304
 
274
305
   user_scores_dsn              DBI:driver:connection
275
306
   user_scores_sql_username     dbusername
276
 
diff -urNad --exclude=CVS --exclude=.svn ./sql/README.awl /tmp/dpep-work.hAWYqo/spamassassin/sql/README.awl
277
 
--- ./sql/README.awl    2005-08-11 20:38:53.000000000 -0400
278
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/sql/README.awl   2005-08-17 23:46:34.000000000 -0400
 
307
diff -urNad spamassassin~/sql/README.awl spamassassin/sql/README.awl
 
308
--- spamassassin~/sql/README.awl        2006-03-10 14:30:12.000000000 -0500
 
309
+++ spamassassin/sql/README.awl 2006-05-07 16:45:40.000000000 -0400
279
310
@@ -15,7 +15,7 @@
280
311
 auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList
281
312
 
285
316
 
286
317
 user_awl_dsn                 DBI:driver:database:hostname[:port]
287
318
 user_awl_sql_username        dbusername
288
 
diff -urNad --exclude=CVS --exclude=.svn ./t/data/testplugin.pm /tmp/dpep-work.hAWYqo/spamassassin/t/data/testplugin.pm
289
 
--- ./t/data/testplugin.pm      2005-08-11 20:38:57.000000000 -0400
290
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/t/data/testplugin.pm     2005-08-17 23:46:34.000000000 -0400
 
319
diff -urNad spamassassin~/t/data/testplugin.pm spamassassin/t/data/testplugin.pm
 
320
--- spamassassin~/t/data/testplugin.pm  2006-03-10 14:30:21.000000000 -0500
 
321
+++ spamassassin/t/data/testplugin.pm   2006-05-07 16:45:40.000000000 -0400
291
322
@@ -1,6 +1,6 @@
292
323
 =head1 
293
324
 
296
327
 
297
328
   loadplugin     myTestPlugin
298
329
   header         MY_TEST_PLUGIN eval:check_test_plugin()
299
 
diff -urNad --exclude=CVS --exclude=.svn ./UPGRADE /tmp/dpep-work.hAWYqo/spamassassin/UPGRADE
300
 
--- ./UPGRADE   2005-08-11 20:38:58.000000000 -0400
301
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/UPGRADE  2005-08-17 23:46:34.000000000 -0400
302
 
@@ -8,7 +8,7 @@
303
 
   perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
304
 
 
305
 
 - There are now multiple files read to enable plugins in the
306
 
-  /etc/mail/spamassassin directory; previously only one, "init.pre" was
307
 
+  /etc/spamassassin directory; previously only one, "init.pre" was
308
 
   read.  Now both "init.pre", "v310.pre", and any other files ending
309
 
   in ".pre" will be read.  As future releases are made, new plugins
310
 
   will be added to new files named according to the release they're
311
 
@@ -139,7 +139,7 @@
312
 
 - If you are using a UNIX machine with all database files on local disks,
313
 
   and no sharing of those databases across NFS filesystems, you can use a
314
 
   more efficient, but non-NFS-safe, locking mechanism.   Do this by adding
315
 
-  the line "lock_method flock" to the /etc/mail/spamassassin/local.cf
316
 
+  the line "lock_method flock" to the /etc/spamassassin/local.cf
317
 
   file. This is strongly recommended if you're not using NFS, as it is
318
 
   much faster than the NFS-safe locker.
319
 
 
320
 
diff -urNad --exclude=CVS --exclude=.svn ./USAGE /tmp/dpep-work.hAWYqo/spamassassin/USAGE
321
 
--- ./USAGE     2005-08-11 20:38:58.000000000 -0400
322
 
+++ /tmp/dpep-work.hAWYqo/spamassassin/USAGE    2005-08-17 23:46:34.000000000 -0400
323
 
@@ -115,7 +115,7 @@
324
 
     CPU-intensive task before they can send mail to you, so we give that
325
 
     some bonus points.  However, it requires that you list what addresses
326
 
     you expect to receive mail for, by adding 'hashcash_accept' lines to
327
 
-    your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
328
 
+    your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf
329
 
     files.  See the Mail::SpamAssassin::Plugin::Hashcash manual page for
330
 
     details on how to specify these.
331
 
 
332
 
@@ -127,14 +127,14 @@
333
 
 
334
 
 
335
 
   - You can create your own system-wide rules files in
336
 
-    /etc/mail/spamassassin; their filenames should end in ".cf".  Multiple
337
 
+    /etc/spamassassin; their filenames should end in ".cf".  Multiple
338
 
     files will be read, and SpamAssassin will not overwrite these files
339
 
     when installing a new version.
340
 
 
341
 
 
342
 
   - You should not modify the files in /usr/share/spamassassin; these
343
 
     will be overwritten when you upgrade.  Any changes you make in
344
 
-    files in the /etc/mail/spamassassin directory,  however, will
345
 
+    files in the /etc/spamassassin directory,  however, will
346
 
     override these files.
347
 
 
348