1 diff -ur Mail-SpamAssassin-4.0.1.orig/INSTALL Mail-SpamAssassin-4.0.1/INSTALL
2 --- Mail-SpamAssassin-4.0.1.orig/INSTALL 2024-03-26 05:52:27.000000000 +0100
3 +++ Mail-SpamAssassin-4.0.1/INSTALL 2024-04-22 18:04:33.805233800 +0200
5 /var/lib/spamassassin), you can find out the default directory with
6 sa-update --help (look for --updatedir). Same needs to be done for
7 LOCAL_RULES_DIR/sa-update-keys (usually: chown -R user:user
8 -/etc/mail/spamassassin/sa-update-keys), the directory can be found with
9 +/etc/spamassassin/sa-update-keys), the directory can be found with
10 spamassassin --help (look for --siteconfigpath).
12 If you wish to install rules from downloaded files, rather than "live" from
14 interpreter. Version 2.83 or later fixes this.
16 If you do not plan to use this plugin, be sure to comment out its
17 - loadplugin line in "/etc/mail/spamassassin/v310.pre".
18 + loadplugin line in "/etc/spamassassin/v310.pre".
20 - Digest::SHA1 (from CPAN)
22 diff -ur Mail-SpamAssassin-4.0.1.orig/ldap/README Mail-SpamAssassin-4.0.1/ldap/README
23 --- Mail-SpamAssassin-4.0.1.orig/ldap/README 2024-03-26 05:52:28.000000000 +0100
24 +++ Mail-SpamAssassin-4.0.1/ldap/README 2024-04-22 18:03:02.480038799 +0200
26 database or LDAP server.
28 SpamAssassin will check the global configuration file (ie. any file matching
29 -/etc/mail/spamassassin/*.cf) for the following settings:
30 +/etc/spamassassin/*.cf) for the following settings:
32 user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
33 user_scores_ldap_username bind dn
34 diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Conf.pm
35 --- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Conf.pm 2024-03-26 05:52:09.000000000 +0100
36 +++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Conf.pm 2024-04-22 18:03:02.480038799 +0200
40 SpamAssassin is configured using traditional UNIX-style configuration files,
41 -loaded from the C</usr/share/spamassassin> and C</etc/mail/spamassassin>
42 +loaded from the C</usr/share/spamassassin> and C</etc/spamassassin>
45 The following web page lists the most important configuration settings
48 These settings differ from the ones above, in that they are considered
49 'privileged'. Only users running C<spamassassin> from their procmailrc's or
50 -forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can
51 +forward files, or sysadmins editing a file in C</etc/spamassassin>, can
52 use them. C<spamd> users cannot use them in their C<user_prefs> files, for
53 security and efficiency reasons, unless C<allow_user_rules> is enabled (and
54 then, they may only add rules from below).
55 diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Phishing.pm
56 --- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2024-03-26 05:52:09.000000000 +0100
57 +++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2024-04-22 18:03:02.480038799 +0200
59 loadplugin Mail::SpamAssassin::Plugin::Phishing
61 ifplugin Mail::SpamAssassin::Plugin::Phishing
62 - phishing_openphish_feed /etc/mail/spamassassin/openphish-feed.txt
63 - phishing_phishtank_feed /etc/mail/spamassassin/phishtank-feed.csv
64 + phishing_openphish_feed /etc/spamassassin/openphish-feed.txt
65 + phishing_phishtank_feed /etc/spamassassin/phishtank-feed.csv
66 body URI_PHISHING eval:check_phishing()
67 describe URI_PHISHING Url match phishing in feed
69 diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Test.pm
70 --- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm 2024-03-26 05:52:10.000000000 +0100
71 +++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Test.pm 2024-04-22 18:03:02.480038799 +0200
75 To try this plugin, write the above two lines in the synopsis to
76 -C</etc/mail/spamassassin/plugintest.cf>.
77 +C</etc/spamassassin/plugintest.cf>.
81 diff -ur Mail-SpamAssassin-4.0.1.orig/lib/spamassassin-run.pod Mail-SpamAssassin-4.0.1/lib/spamassassin-run.pod
82 --- Mail-SpamAssassin-4.0.1.orig/lib/spamassassin-run.pod 2024-03-26 05:52:11.000000000 +0100
83 +++ Mail-SpamAssassin-4.0.1/lib/spamassassin-run.pod 2024-04-22 18:03:02.480038799 +0200
85 -p prefs, --prefspath=file, --prefs-file=file
86 Set user preferences file
87 --siteconfigpath=path Path for site configs
88 - (def: /etc/mail/spamassassin)
89 + (def: /etc/spamassassin)
90 --cf='config line' Additional line of configuration
91 --pre='config line' Additional line of ".pre" (prepended to configuration)
92 -x, --nocreate-prefs Don't create user preferences file
94 =item B<--siteconfigpath>=I<path>
96 Use the specified path for locating site-specific configuration files. Ignore
97 -the default directories (usually C</etc/mail/spamassassin> or similar).
98 +the default directories (usually C</etc/spamassassin> or similar).
100 =item B<--cf='config line'>
102 diff -ur Mail-SpamAssassin-4.0.1.orig/PACKAGING Mail-SpamAssassin-4.0.1/PACKAGING
103 --- Mail-SpamAssassin-4.0.1.orig/PACKAGING 2024-03-26 05:52:28.000000000 +0100
104 +++ Mail-SpamAssassin-4.0.1/PACKAGING 2024-04-22 18:04:14.196977227 +0200
107 This will install the spamassassin apps in /foo/bin, the libs in
108 /foo/lib/perl5, the shared stuff in /foo/share/spamassassin and make
109 - SpamAssassin look for config files in /foo/etc/mail/spamassassin:
110 + SpamAssassin look for config files in /foo/etc/spamassassin:
111 perl Makefile.PL PREFIX=/foo
114 diff -ur Mail-SpamAssassin-4.0.1.orig/README Mail-SpamAssassin-4.0.1/README
115 --- Mail-SpamAssassin-4.0.1.orig/README 2024-03-26 05:52:27.000000000 +0100
116 +++ Mail-SpamAssassin-4.0.1/README 2024-04-22 18:03:02.480038799 +0200
117 @@ -114,13 +114,13 @@
118 not modify these, as they are overwritten when you run
121 - - /etc/mail/spamassassin/*.cf:
122 + - /etc/spamassassin/*.cf:
124 Site config files, for system admins to create, modify, and
125 add local rules and scores to. Modifications here will be
126 appended to the config loaded from the above directory.
128 - - /etc/mail/spamassassin/*.pre:
129 + - /etc/spamassassin/*.pre:
131 Plugin control files, installed from the distribution. These are
132 used to control what plugins are loaded. Modifications here will
135 You want to modify these files if you want to load additional
136 plugins, or inhibit loading a plugin that is enabled by default.
137 - If the files exist in /etc/mail/spamassassin, they will not
138 + If the files exist in /etc/spamassassin, they will not
139 be overwritten during future installs.
141 - /usr/share/spamassassin/user_prefs.template:
142 @@ -137,14 +137,14 @@
143 Distributed default user preferences. Do not modify this, as it is
144 overwritten when you upgrade.
146 - - /etc/mail/spamassassin/user_prefs.template:
147 + - /etc/spamassassin/user_prefs.template:
149 Default user preferences, for system admins to create, modify, and
150 set defaults for users' preferences files. Takes precedence over
151 the above prefs file, if it exists.
153 Do not put system-wide settings in here; put them in a file in the
154 - "/etc/mail/spamassassin" directory ending in ".cf". This file is
155 + "/etc/spamassassin" directory ending in ".cf". This file is
156 just a template, which will be copied to a user's home directory
159 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/init.pre Mail-SpamAssassin-4.0.1/rules/init.pre
160 --- Mail-SpamAssassin-4.0.1.orig/rules/init.pre 2024-03-26 05:52:15.000000000 +0100
161 +++ Mail-SpamAssassin-4.0.1/rules/init.pre 2024-04-22 18:03:02.480038799 +0200
163 # already have a file in place called "init.pre".
165 # There are now multiple files read to enable plugins in the
166 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
167 +# /etc/spamassassin directory; previously only one, "init.pre" was
168 # read. Now both "init.pre", "v310.pre", and any other files ending in
169 # ".pre" will be read. As future releases are made, new plugins will be
170 # added to new files, named according to the release they're added in.
171 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/user_prefs.template Mail-SpamAssassin-4.0.1/rules/user_prefs.template
172 --- Mail-SpamAssassin-4.0.1.orig/rules/user_prefs.template 2024-03-26 05:52:15.000000000 +0100
173 +++ Mail-SpamAssassin-4.0.1/rules/user_prefs.template 2024-04-22 18:03:02.480038799 +0200
175 #* directory. At runtime, if a user has no preferences in their home directory
176 #* already, it will be copied for them, allowing them to perform personalised
177 #* customisation. If you want to make changes to the site-wide defaults,
178 -#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
179 +#* create a file in /etc/spamassassin instead.
180 ###########################################################################
182 # How many points before a mail is considered spam.
183 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v310.pre Mail-SpamAssassin-4.0.1/rules/v310.pre
184 --- Mail-SpamAssassin-4.0.1.orig/rules/v310.pre 2024-03-26 05:52:15.000000000 +0100
185 +++ Mail-SpamAssassin-4.0.1/rules/v310.pre 2024-04-22 18:03:02.480038799 +0200
189 # There are now multiple files read to enable plugins in the
190 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
191 +# /etc/spamassassin directory; previously only one, "init.pre" was
192 # read. Now both "init.pre", "v310.pre", and any other files ending in
193 # ".pre" will be read. As future releases are made, new plugins will be
194 # added to new files, named according to the release they're added in.
195 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v312.pre Mail-SpamAssassin-4.0.1/rules/v312.pre
196 --- Mail-SpamAssassin-4.0.1.orig/rules/v312.pre 2024-03-26 05:52:15.000000000 +0100
197 +++ Mail-SpamAssassin-4.0.1/rules/v312.pre 2024-04-22 18:03:02.480038799 +0200
201 # There are now multiple files read to enable plugins in the
202 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
203 +# /etc/spamassassin directory; previously only one, "init.pre" was
204 # read. Now both "init.pre", "v310.pre", and any other files ending in
205 # ".pre" will be read. As future releases are made, new plugins will be
206 # added to new files, named according to the release they're added in.
207 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v320.pre Mail-SpamAssassin-4.0.1/rules/v320.pre
208 --- Mail-SpamAssassin-4.0.1.orig/rules/v320.pre 2024-03-26 05:52:15.000000000 +0100
209 +++ Mail-SpamAssassin-4.0.1/rules/v320.pre 2024-04-22 18:03:02.480038799 +0200
213 # There are now multiple files read to enable plugins in the
214 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
215 +# /etc/spamassassin directory; previously only one, "init.pre" was
216 # read. Now both "init.pre", "v310.pre", and any other files ending in
217 # ".pre" will be read. As future releases are made, new plugins will be
218 # added to new files, named according to the release they're added in.
219 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v330.pre Mail-SpamAssassin-4.0.1/rules/v330.pre
220 --- Mail-SpamAssassin-4.0.1.orig/rules/v330.pre 2024-03-26 05:52:15.000000000 +0100
221 +++ Mail-SpamAssassin-4.0.1/rules/v330.pre 2024-04-22 18:03:02.556039793 +0200
225 # There are now multiple files read to enable plugins in the
226 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
227 +# /etc/spamassassin directory; previously only one, "init.pre" was
228 # read. Now both "init.pre", "v310.pre", and any other files ending in
229 # ".pre" will be read. As future releases are made, new plugins will be
230 # added to new files, named according to the release they're added in.
231 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v340.pre Mail-SpamAssassin-4.0.1/rules/v340.pre
232 --- Mail-SpamAssassin-4.0.1.orig/rules/v340.pre 2024-03-26 05:52:15.000000000 +0100
233 +++ Mail-SpamAssassin-4.0.1/rules/v340.pre 2024-04-22 18:03:02.556039793 +0200
237 # There are now multiple files read to enable plugins in the
238 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
239 +# /etc/spamassassin directory; previously only one, "init.pre" was
240 # read. Now both "init.pre", "v310.pre", and any other files ending in
241 # ".pre" will be read. As future releases are made, new plugins will be
242 # added to new files, named according to the release they're added in.
243 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v341.pre Mail-SpamAssassin-4.0.1/rules/v341.pre
244 --- Mail-SpamAssassin-4.0.1.orig/rules/v341.pre 2024-03-26 05:52:15.000000000 +0100
245 +++ Mail-SpamAssassin-4.0.1/rules/v341.pre 2024-04-22 18:03:02.556039793 +0200
249 # There are now multiple files read to enable plugins in the
250 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
251 +# /etc/spamassassin directory; previously only one, "init.pre" was
252 # read. Now both "init.pre", "v310.pre", and any other files ending in
253 # ".pre" will be read. As future releases are made, new plugins will be
254 # added to new files, named according to the release they're added in.
255 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v342.pre Mail-SpamAssassin-4.0.1/rules/v342.pre
256 --- Mail-SpamAssassin-4.0.1.orig/rules/v342.pre 2024-03-26 05:52:13.000000000 +0100
257 +++ Mail-SpamAssassin-4.0.1/rules/v342.pre 2024-04-22 18:03:02.556039793 +0200
261 # There are now multiple files read to enable plugins in the
262 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
263 +# /etc/spamassassin directory; previously only one, "init.pre" was
264 # read. Now both "init.pre", "v310.pre", and any other files ending in
265 # ".pre" will be read. As future releases are made, new plugins will be
266 # added to new files, named according to the release they're added in.
267 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v343.pre Mail-SpamAssassin-4.0.1/rules/v343.pre
268 --- Mail-SpamAssassin-4.0.1.orig/rules/v343.pre 2024-03-26 05:52:15.000000000 +0100
269 +++ Mail-SpamAssassin-4.0.1/rules/v343.pre 2024-04-22 18:04:48.613427568 +0200
273 # There are now multiple files read to enable plugins in the
274 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
275 +# /etc/spamassassin directory; previously only one, "init.pre" was
276 # read. Now both "init.pre", "v310.pre", and any other files ending in
277 # ".pre" will be read. As future releases are made, new plugins will be
278 # added to new files, named according to the release they're added in.
279 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v400.pre Mail-SpamAssassin-4.0.1/rules/v400.pre
280 --- Mail-SpamAssassin-4.0.1.orig/rules/v400.pre 2024-03-26 05:52:15.000000000 +0100
281 +++ Mail-SpamAssassin-4.0.1/rules/v400.pre 2024-04-22 18:04:51.097460068 +0200
285 # There are now multiple files read to enable plugins in the
286 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
287 +# /etc/spamassassin directory; previously only one, "init.pre" was
288 # read. Now both "init.pre", "v310.pre", and any other files ending in
289 # ".pre" will be read. As future releases are made, new plugins will be
290 # added to new files, named according to the release they're added in.
291 diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v401.pre Mail-SpamAssassin-4.0.1/rules/v401.pre
292 --- Mail-SpamAssassin-4.0.1.orig/rules/v401.pre 2024-03-26 05:52:15.000000000 +0100
293 +++ Mail-SpamAssassin-4.0.1/rules/v401.pre 2024-04-22 18:04:46.201396005 +0200
297 # There are now multiple files read to enable plugins in the
298 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
299 +# /etc/spamassassin directory; previously only one, "init.pre" was
300 # read. Now both "init.pre", "v310.pre", and any other files ending in
301 # ".pre" will be read. As future releases are made, new plugins will be
302 # added to new files, named according to the release they're added in.
303 diff -ur Mail-SpamAssassin-4.0.1.orig/sa-compile.raw Mail-SpamAssassin-4.0.1/sa-compile.raw
304 --- Mail-SpamAssassin-4.0.1.orig/sa-compile.raw 2024-03-26 05:52:25.000000000 +0100
305 +++ Mail-SpamAssassin-4.0.1/sa-compile.raw 2024-04-22 18:03:02.556039793 +0200
307 -p prefs, --prefspath=file, --prefs-file=file
308 Set user preferences file
309 --siteconfigpath=path Path for site configs
310 - (default: @@PREFIX@@/etc/mail/spamassassin)
311 + (default: @@PREFIX@@/etc/spamassassin)
312 --updatedir=path Directory to place updates
313 (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/@@VERSION@@)
314 --cf='config line' Additional line of configuration
316 =item B<--siteconfigpath>=I<path>
318 Use the specified path for locating site-specific configuration files. Ignore
319 -the default directories (usually C</etc/mail/spamassassin> or similar).
320 +the default directories (usually C</etc/spamassassin> or similar).
324 diff -ur Mail-SpamAssassin-4.0.1.orig/sa-learn.raw Mail-SpamAssassin-4.0.1/sa-learn.raw
325 --- Mail-SpamAssassin-4.0.1.orig/sa-learn.raw 2024-03-26 05:52:25.000000000 +0100
326 +++ Mail-SpamAssassin-4.0.1/sa-learn.raw 2024-04-22 18:03:02.556039793 +0200
328 -p prefs, --prefspath=file, --prefs-file=file
329 Set user preferences file
330 --siteconfigpath=path Path for site configs
331 - (default: @@PREFIX@@/etc/mail/spamassassin)
332 + (default: @@PREFIX@@/etc/spamassassin)
333 --cf='config line' Additional line of configuration
334 -D, --debug [area,...] Print debugging messages
335 -V, --version Print version
337 =item B<--siteconfigpath>=I<path>
339 Use the specified path for locating site-specific configuration files. Ignore
340 -the default directories (usually C</etc/mail/spamassassin> or similar).
341 +the default directories (usually C</etc/spamassassin> or similar).
343 =item B<--cf='config line'>
345 diff -ur Mail-SpamAssassin-4.0.1.orig/spamc/spamc.pod Mail-SpamAssassin-4.0.1/spamc/spamc.pod
346 --- Mail-SpamAssassin-4.0.1.orig/spamc/spamc.pod 2024-03-26 05:52:25.000000000 +0100
347 +++ Mail-SpamAssassin-4.0.1/spamc/spamc.pod 2024-04-22 18:03:02.556039793 +0200
350 If the B<-F> switch is specified, that file will be used. Otherwise,
351 C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
352 -/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>
353 -switch is not specified, no configuration file will be read.
354 +/etc/spamassassin). If that file doesn't exist, and the B<-F> switch
355 +is not specified, no configuration file will be read.
359 diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/README Mail-SpamAssassin-4.0.1/spamd/README
360 --- Mail-SpamAssassin-4.0.1.orig/spamd/README 2024-03-26 05:52:25.000000000 +0100
361 +++ Mail-SpamAssassin-4.0.1/spamd/README 2024-04-22 18:03:02.556039793 +0200
363 If you plan to use Bayesian classification (the BAYES rules) with spamd,
364 you will need to either
366 - 1. modify /etc/mail/spamassassin/local.cf to use a shared database of
367 + 1. modify /etc/spamassassin/local.cf to use a shared database of
368 tokens, by setting the 'bayes_path' setting to a path all users can read
369 and write to. You will also need to set the 'bayes_file_mode' setting
370 to 0666 so that created files are shared, too.
371 diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/README.vpopmail Mail-SpamAssassin-4.0.1/spamd/README.vpopmail
372 --- Mail-SpamAssassin-4.0.1.orig/spamd/README.vpopmail 2024-03-26 05:52:25.000000000 +0100
373 +++ Mail-SpamAssassin-4.0.1/spamd/README.vpopmail 2024-04-22 18:03:02.556039793 +0200
375 /home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
377 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
378 -This is specified in your /etc/mail/spamassassin/local.cf file. Perhaps a
379 +This is specified in your /etc/spamassassin/local.cf file. Perhaps a
380 future enhancement would be to add the capability to have personal AWL db.
382 6. Of course vpopmail must have the seekable patch installed (see
383 diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/spamd.raw Mail-SpamAssassin-4.0.1/spamd/spamd.raw
384 --- Mail-SpamAssassin-4.0.1.orig/spamd/spamd.raw 2024-03-26 05:52:25.000000000 +0100
385 +++ Mail-SpamAssassin-4.0.1/spamd/spamd.raw 2024-04-22 18:03:02.556039793 +0200
386 @@ -3453,7 +3453,7 @@
387 =item B<--siteconfigpath>=I<path>
389 Use the specified path for locating site-specific configuration files. Ignore
390 -the default directories (usually C</etc/mail/spamassassin> or similar).
391 +the default directories (usually C</etc/spamassassin> or similar).
393 =item B<--cf='config line'>
395 diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/suse-ancient-rc-script.sh Mail-SpamAssassin-4.0.1/spamd/suse-ancient-rc-script.sh
396 --- Mail-SpamAssassin-4.0.1.orig/spamd/suse-ancient-rc-script.sh 2024-03-26 05:52:25.000000000 +0100
397 +++ Mail-SpamAssassin-4.0.1/spamd/suse-ancient-rc-script.sh 2024-04-22 18:04:56.913536172 +0200
399 ## Optional: Probe for the necessity of a reload,
400 ## give out the argument which is required for a reload.
402 - test /etc/mail/spamassassin/local.cf -nt $SPAMD_PID && echo force-reload
403 + test /etc/spamassassin/local.cf -nt $SPAMD_PID && echo force-reload
406 echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
407 diff -ur Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
408 --- Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2024-03-26 05:52:25.000000000 +0100
409 +++ Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2024-04-22 18:03:02.556039793 +0200
413 SANew DEF_RULES_DIR "/usr/share/spamassassin"
414 - SANew LOCAL_RULES_DIR "/etc/mail/spamassassin"
415 + SANew LOCAL_RULES_DIR "/etc/spamassassin"
416 SANew LOCAL_STATE_DIR "/var/lib"
422 SANew DEF_RULES_DIR "/usr/share/spamassassin"
423 - SANew LOCAL_RULES_DIR "/etc/mail/spamassassin"
424 + SANew LOCAL_RULES_DIR "/etc/spamassassin"
425 SANew LOCAL_STATE_DIR "/var/lib"
427 LoadModule ident_module /usr/lib/apache/mod_ident.so
428 diff -ur Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
429 --- Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2024-03-26 05:52:25.000000000 +0100
430 +++ Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2024-04-22 18:03:02.560039845 +0200
432 # substituted at 'make' time
434 DEF_RULES_DIR => '/usr/share/spamassassin',
435 - LOCAL_RULES_DIR => '/etc/mail/spamassassin',
436 + LOCAL_RULES_DIR => '/etc/spamassassin',
437 LOCAL_STATE_DIR => '/var/lib',
440 diff -ur Mail-SpamAssassin-4.0.1.orig/sql/README Mail-SpamAssassin-4.0.1/sql/README
441 --- Mail-SpamAssassin-4.0.1.orig/sql/README 2024-03-26 05:52:25.000000000 +0100
442 +++ Mail-SpamAssassin-4.0.1/sql/README 2024-04-22 18:03:02.560039845 +0200
446 SpamAssassin will check the global configuration file (ie. any file matching
447 -/etc/mail/spamassassin/*.cf) for the following settings:
448 +/etc/spamassassin/*.cf) for the following settings:
450 user_scores_dsn DBI:driver:connection
451 user_scores_sql_username dbusername
452 diff -ur Mail-SpamAssassin-4.0.1.orig/sql/README.awl Mail-SpamAssassin-4.0.1/sql/README.awl
453 --- Mail-SpamAssassin-4.0.1.orig/sql/README.awl 2024-03-26 05:52:25.000000000 +0100
454 +++ Mail-SpamAssassin-4.0.1/sql/README.awl 2024-04-22 18:03:02.560039845 +0200
456 auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList
458 SpamAssassin will check the global configuration file (ie. any file
459 -matching /etc/mail/spamassassin/*.cf) for the following settings:
460 +matching /etc/spamassassin/*.cf) for the following settings:
462 user_awl_dsn DBI:driver:database:hostname[:port]
463 user_awl_sql_username dbusername
464 diff -ur Mail-SpamAssassin-4.0.1.orig/sql/README.txrep Mail-SpamAssassin-4.0.1/sql/README.txrep
465 --- Mail-SpamAssassin-4.0.1.orig/sql/README.txrep 2024-03-26 05:52:25.000000000 +0100
466 +++ Mail-SpamAssassin-4.0.1/sql/README.txrep 2024-04-22 18:03:02.560039845 +0200
468 txrep_factory Mail::SpamAssassin::SQLBasedAddrList
470 SpamAssassin will check the global configuration file (ie. any file
471 -matching /etc/mail/spamassassin/*.cf) for the following settings:
472 +matching /etc/spamassassin/*.cf) for the following settings:
474 user_awl_dsn DBI:driver:database:hostname[:port]
475 user_awl_sql_username dbusername
476 diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/taintcheckplugin.pm Mail-SpamAssassin-4.0.1/t/data/taintcheckplugin.pm
477 --- Mail-SpamAssassin-4.0.1.orig/t/data/taintcheckplugin.pm 2024-03-26 05:52:17.000000000 +0100
478 +++ Mail-SpamAssassin-4.0.1/t/data/taintcheckplugin.pm 2024-04-22 18:03:02.560039845 +0200
480 =head1 taintcheckplugin.pm
482 -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
483 +To try this out, write these lines to /etc/spamassassin/plugintest.cf:
485 loadplugin myTestPlugin
486 header MY_TEST_PLUGIN eval:check_test_plugin()
487 diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/testplugin2.pm Mail-SpamAssassin-4.0.1/t/data/testplugin2.pm
488 --- Mail-SpamAssassin-4.0.1.orig/t/data/testplugin2.pm 2024-03-26 05:52:17.000000000 +0100
489 +++ Mail-SpamAssassin-4.0.1/t/data/testplugin2.pm 2024-04-22 18:03:02.560039845 +0200
491 =head1 testplugin2.pm
493 -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
494 +To try this out, write these lines to /etc/spamassassin/plugintest.cf:
496 loadplugin myTestPlugin
497 header MY_TEST_PLUGIN eval:check_test_plugin()
498 diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/testplugin.pm Mail-SpamAssassin-4.0.1/t/data/testplugin.pm
499 --- Mail-SpamAssassin-4.0.1.orig/t/data/testplugin.pm 2024-03-26 05:52:17.000000000 +0100
500 +++ Mail-SpamAssassin-4.0.1/t/data/testplugin.pm 2024-04-22 18:03:02.560039845 +0200
504 -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
505 +To try this out, write these lines to /etc/spamassassin/plugintest.cf:
507 loadplugin myTestPlugin
508 header MY_TEST_PLUGIN eval:check_test_plugin()
509 diff -ur Mail-SpamAssassin-4.0.1.orig/t/sa_compile.t Mail-SpamAssassin-4.0.1/t/sa_compile.t
510 --- Mail-SpamAssassin-4.0.1.orig/t/sa_compile.t 2024-03-26 05:52:17.000000000 +0100
511 +++ Mail-SpamAssassin-4.0.1/t/sa_compile.t 2024-04-22 18:03:02.560039845 +0200
513 system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
515 &new_instdir("basic");
516 -&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/mail/spamassassin");
517 +&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/spamassassin");
519 # we now have an "installed" version we can run sa-compile with. Ensure
520 # sarun() will use it appropriately
523 #Create the dir for the pre file
525 - $file = "$instdir/etc/mail/spamassassin/v330.pre";
526 + $file = "$instdir/etc/spamassassin/v330.pre";
527 $dir = dirname($file);
530 diff -ur Mail-SpamAssassin-4.0.1.orig/USAGE Mail-SpamAssassin-4.0.1/USAGE
531 --- Mail-SpamAssassin-4.0.1.orig/USAGE 2024-03-26 05:52:27.000000000 +0100
532 +++ Mail-SpamAssassin-4.0.1/USAGE 2024-04-22 18:03:02.560039845 +0200
533 @@ -120,14 +120,14 @@
536 - You can create your own system-wide rules files in
537 - /etc/mail/spamassassin; their filenames should end in ".cf". Multiple
538 + /etc/spamassassin; their filenames should end in ".cf". Multiple
539 files will be read, and SpamAssassin will not overwrite these files
540 when installing a new version.
543 - You should not modify the files in /usr/share/spamassassin; these
544 will be overwritten when you upgrade. Any changes you make in
545 - files in the /etc/mail/spamassassin directory, however, will
546 + files in the /etc/spamassassin directory, however, will
547 override these files.