1 diff -ur Mail-SpamAssassin-3.4.2.orig/INSTALL Mail-SpamAssassin-3.4.2/INSTALL
2 --- Mail-SpamAssassin-3.4.2.orig/INSTALL 2018-09-14 03:27:51.000000000 +0200
3 +++ Mail-SpamAssassin-3.4.2/INSTALL 2019-01-26 00:07:45.957000000 +0100
5 perl interpreter. Version 2.83 or later fixes this.
7 If you do not plan to use this plugin, be sure to comment out
8 - its loadplugin line in "/etc/mail/spamassassin/v310.pre".
9 + its loadplugin line in "/etc/spamassassin/v310.pre".
13 diff -ur Mail-SpamAssassin-3.4.2.orig/ldap/README Mail-SpamAssassin-3.4.2/ldap/README
14 --- Mail-SpamAssassin-3.4.2.orig/ldap/README 2018-09-14 03:27:55.000000000 +0200
15 +++ Mail-SpamAssassin-3.4.2/ldap/README 2019-01-26 00:07:45.958000000 +0100
17 database or LDAP server.
19 SpamAssassin will check the global configuration file (ie. any file matching
20 -/etc/mail/spamassassin/*.cf) for the following settings:
21 +/etc/spamassassin/*.cf) for the following settings:
23 user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
24 user_scores_ldap_username bind dn
25 diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm
26 --- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm 2018-09-14 03:27:51.000000000 +0200
27 +++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm 2019-01-26 00:07:45.958000000 +0100
31 SpamAssassin is configured using traditional UNIX-style configuration files,
32 -loaded from the C</usr/share/spamassassin> and C</etc/mail/spamassassin>
33 +loaded from the C</usr/share/spamassassin> and C</etc/spamassassin>
36 The following web page lists the most important configuration settings
39 These settings differ from the ones above, in that they are considered
40 'privileged'. Only users running C<spamassassin> from their procmailrc's or
41 -forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can
42 +forward files, or sysadmins editing a file in C</etc/spamassassin>, can
43 use them. C<spamd> users cannot use them in their C<user_prefs> files, for
44 security and efficiency reasons, unless C<allow_user_rules> is enabled (and
45 then, they may only add rules from below).
46 diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm
47 --- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2018-09-14 03:27:51.000000000 +0200
48 +++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2019-01-26 00:08:01.418000000 +0100
50 loadplugin Mail::SpamAssassin::Plugin::Phishing
52 ifplugin Mail::SpamAssassin::Plugin::Phishing
53 - phishing_openphish_feed /etc/mail/spamassassin/openphish-feed.txt
54 - phishing_phishtank_feed /etc/mail/spamassassin/phishtank-feed.csv
55 + phishing_openphish_feed /etc/spamassassin/openphish-feed.txt
56 + phishing_phishtank_feed /etc/spamassassin/phishtank-feed.csv
57 body URI_PHISHING eval:check_phishing()
58 describe URI_PHISHING Url match phishing in feed
60 diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Test.pm Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm
61 --- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Test.pm 2018-09-14 03:27:51.000000000 +0200
62 +++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm 2019-01-26 00:07:45.958000000 +0100
66 To try this plugin, write the above two lines in the synopsis to
67 -C</etc/mail/spamassassin/plugintest.cf>.
68 +C</etc/spamassassin/plugintest.cf>.
72 diff -ur Mail-SpamAssassin-3.4.2.orig/lib/spamassassin-run.pod Mail-SpamAssassin-3.4.2/lib/spamassassin-run.pod
73 --- Mail-SpamAssassin-3.4.2.orig/lib/spamassassin-run.pod 2018-09-14 03:27:51.000000000 +0200
74 +++ Mail-SpamAssassin-3.4.2/lib/spamassassin-run.pod 2019-01-26 00:07:45.958000000 +0100
76 -p prefs, --prefspath=file, --prefs-file=file
77 Set user preferences file
78 --siteconfigpath=path Path for site configs
79 - (def: /etc/mail/spamassassin)
80 + (def: /etc/spamassassin)
81 --cf='config line' Additional line of configuration
82 -x, --nocreate-prefs Don't create user preferences file
83 -e, --exit-code Exit with a non-zero exit code if the
85 =item B<--siteconfigpath>=I<path>
87 Use the specified path for locating site-specific configuration files. Ignore
88 -the default directories (usually C</etc/mail/spamassassin> or similar).
89 +the default directories (usually C</etc/spamassassin> or similar).
91 =item B<--cf='config line'>
93 diff -ur Mail-SpamAssassin-3.4.2.orig/README Mail-SpamAssassin-3.4.2/README
94 --- Mail-SpamAssassin-3.4.2.orig/README 2018-09-14 03:27:52.000000000 +0200
95 +++ Mail-SpamAssassin-3.4.2/README 2019-01-26 00:07:45.957000000 +0100
97 not modify these, as they are overwritten when you run
100 - - /etc/mail/spamassassin/*.cf:
101 + - /etc/spamassassin/*.cf:
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.
107 - - /etc/mail/spamassassin/*.pre:
108 + - /etc/spamassassin/*.pre:
110 Plugin control files, installed from the distribution. These are
111 used to control what plugins are loaded. Modifications here will
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.
120 - /usr/share/spamassassin/user_prefs.template:
121 @@ -137,14 +137,14 @@
122 Distributed default user preferences. Do not modify this, as it is
123 overwritten when you upgrade.
125 - - /etc/mail/spamassassin/user_prefs.template:
126 + - /etc/spamassassin/user_prefs.template:
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.
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
138 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/init.pre Mail-SpamAssassin-3.4.2/rules/init.pre
139 --- Mail-SpamAssassin-3.4.2.orig/rules/init.pre 2017-03-18 14:05:04.000000000 +0100
140 +++ Mail-SpamAssassin-3.4.2/rules/init.pre 2019-01-26 00:09:43.345000000 +0100
142 # already have a file in place called "init.pre".
144 # There are now multiple files read to enable plugins in the
145 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
146 +# /etc/spamassassin directory; previously only one, "init.pre" was
147 # read. Now both "init.pre", "v310.pre", and any other files ending in
148 # ".pre" will be read. As future releases are made, new plugins will be
149 # added to new files, named according to the release they're added in.
150 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/user_prefs.template Mail-SpamAssassin-3.4.2/rules/user_prefs.template
151 --- Mail-SpamAssassin-3.4.2.orig/rules/user_prefs.template 2017-03-18 14:05:04.000000000 +0100
152 +++ Mail-SpamAssassin-3.4.2/rules/user_prefs.template 2019-01-26 00:07:45.958000000 +0100
154 #* directory. At runtime, if a user has no preferences in their home directory
155 #* already, it will be copied for them, allowing them to perform personalised
156 #* customisation. If you want to make changes to the site-wide defaults,
157 -#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
158 +#* create a file in /etc/spamassassin instead.
159 ###########################################################################
161 # How many points before a mail is considered spam.
162 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v310.pre Mail-SpamAssassin-3.4.2/rules/v310.pre
163 --- Mail-SpamAssassin-3.4.2.orig/rules/v310.pre 2017-03-18 14:05:04.000000000 +0100
164 +++ Mail-SpamAssassin-3.4.2/rules/v310.pre 2019-01-26 00:09:51.945000000 +0100
168 # There are now multiple files read to enable plugins in the
169 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
170 +# /etc/spamassassin directory; previously only one, "init.pre" was
171 # read. Now both "init.pre", "v310.pre", and any other files ending in
172 # ".pre" will be read. As future releases are made, new plugins will be
173 # added to new files, named according to the release they're added in.
174 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v312.pre Mail-SpamAssassin-3.4.2/rules/v312.pre
175 --- Mail-SpamAssassin-3.4.2.orig/rules/v312.pre 2017-03-18 14:05:04.000000000 +0100
176 +++ Mail-SpamAssassin-3.4.2/rules/v312.pre 2019-01-26 00:09:47.217000000 +0100
180 # There are now multiple files read to enable plugins in the
181 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
182 +# /etc/spamassassin directory; previously only one, "init.pre" was
183 # read. Now both "init.pre", "v310.pre", and any other files ending in
184 # ".pre" will be read. As future releases are made, new plugins will be
185 # added to new files, named according to the release they're added in.
186 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v320.pre Mail-SpamAssassin-3.4.2/rules/v320.pre
187 --- Mail-SpamAssassin-3.4.2.orig/rules/v320.pre 2017-03-18 14:05:04.000000000 +0100
188 +++ Mail-SpamAssassin-3.4.2/rules/v320.pre 2019-01-26 00:09:36.398000000 +0100
192 # There are now multiple files read to enable plugins in the
193 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
194 +# /etc/spamassassin directory; previously only one, "init.pre" was
195 # read. Now both "init.pre", "v310.pre", and any other files ending in
196 # ".pre" will be read. As future releases are made, new plugins will be
197 # added to new files, named according to the release they're added in.
198 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v330.pre Mail-SpamAssassin-3.4.2/rules/v330.pre
199 --- Mail-SpamAssassin-3.4.2.orig/rules/v330.pre 2017-03-18 14:05:04.000000000 +0100
200 +++ Mail-SpamAssassin-3.4.2/rules/v330.pre 2019-01-26 00:09:49.197000000 +0100
204 # There are now multiple files read to enable plugins in the
205 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
206 +# /etc/spamassassin directory; previously only one, "init.pre" was
207 # read. Now both "init.pre", "v310.pre", and any other files ending in
208 # ".pre" will be read. As future releases are made, new plugins will be
209 # added to new files, named according to the release they're added in.
210 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v340.pre Mail-SpamAssassin-3.4.2/rules/v340.pre
211 --- Mail-SpamAssassin-3.4.2.orig/rules/v340.pre 2017-03-18 14:05:04.000000000 +0100
212 +++ Mail-SpamAssassin-3.4.2/rules/v340.pre 2019-01-26 00:09:45.297000000 +0100
216 # There are now multiple files read to enable plugins in the
217 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
218 +# /etc/spamassassin directory; previously only one, "init.pre" was
219 # read. Now both "init.pre", "v310.pre", and any other files ending in
220 # ".pre" will be read. As future releases are made, new plugins will be
221 # added to new files, named according to the release they're added in.
222 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v341.pre Mail-SpamAssassin-3.4.2/rules/v341.pre
223 --- Mail-SpamAssassin-3.4.2.orig/rules/v341.pre 2017-03-18 14:05:04.000000000 +0100
224 +++ Mail-SpamAssassin-3.4.2/rules/v341.pre 2019-01-26 00:09:34.297000000 +0100
228 # There are now multiple files read to enable plugins in the
229 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
230 +# /etc/spamassassin directory; previously only one, "init.pre" was
231 # read. Now both "init.pre", "v310.pre", and any other files ending in
232 # ".pre" will be read. As future releases are made, new plugins will be
233 # added to new files, named according to the release they're added in.
234 diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v342.pre Mail-SpamAssassin-3.4.2/rules/v342.pre
235 --- Mail-SpamAssassin-3.4.2.orig/rules/v342.pre 2018-09-01 05:55:41.000000000 +0200
236 +++ Mail-SpamAssassin-3.4.2/rules/v342.pre 2019-01-26 00:09:38.537000000 +0100
240 # There are now multiple files read to enable plugins in the
241 -# /etc/mail/spamassassin directory; previously only one, "init.pre" was
242 +# /etc/spamassassin directory; previously only one, "init.pre" was
243 # read. Now both "init.pre", "v310.pre", and any other files ending in
244 # ".pre" will be read. As future releases are made, new plugins will be
245 # added to new files, named according to the release they're added in.
246 diff -ur Mail-SpamAssassin-3.4.2.orig/sa-compile.raw Mail-SpamAssassin-3.4.2/sa-compile.raw
247 --- Mail-SpamAssassin-3.4.2.orig/sa-compile.raw 2018-09-14 03:27:51.000000000 +0200
248 +++ Mail-SpamAssassin-3.4.2/sa-compile.raw 2019-01-26 00:07:45.959000000 +0100
250 -p prefs, --prefspath=file, --prefs-file=file
251 Set user preferences file
252 --siteconfigpath=path Path for site configs
253 - (default: @@PREFIX@@/etc/mail/spamassassin)
254 + (default: @@PREFIX@@/etc/spamassassin)
255 --updatedir=path Directory to place updates
256 (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/@@VERSION@@)
257 --cf='config line' Additional line of configuration
259 =item B<--siteconfigpath>=I<path>
261 Use the specified path for locating site-specific configuration files. Ignore
262 -the default directories (usually C</etc/mail/spamassassin> or similar).
263 +the default directories (usually C</etc/spamassassin> or similar).
267 diff -ur Mail-SpamAssassin-3.4.2.orig/sa-learn.raw Mail-SpamAssassin-3.4.2/sa-learn.raw
268 --- Mail-SpamAssassin-3.4.2.orig/sa-learn.raw 2018-09-14 03:27:56.000000000 +0200
269 +++ Mail-SpamAssassin-3.4.2/sa-learn.raw 2019-01-26 00:07:45.959000000 +0100
271 -p prefs, --prefspath=file, --prefs-file=file
272 Set user preferences file
273 --siteconfigpath=path Path for site configs
274 - (default: @@PREFIX@@/etc/mail/spamassassin)
275 + (default: @@PREFIX@@/etc/spamassassin)
276 --cf='config line' Additional line of configuration
277 -D, --debug [area=n,...] Print debugging messages
278 -V, --version Print version
280 =item B<--siteconfigpath>=I<path>
282 Use the specified path for locating site-specific configuration files. Ignore
283 -the default directories (usually C</etc/mail/spamassassin> or similar).
284 +the default directories (usually C</etc/spamassassin> or similar).
286 =item B<--cf='config line'>
288 diff -ur Mail-SpamAssassin-3.4.2.orig/spamc/spamc.pod Mail-SpamAssassin-3.4.2/spamc/spamc.pod
289 --- Mail-SpamAssassin-3.4.2.orig/spamc/spamc.pod 2018-09-14 03:27:52.000000000 +0200
290 +++ Mail-SpamAssassin-3.4.2/spamc/spamc.pod 2019-01-26 00:07:45.959000000 +0100
293 If the B<-F> switch is specified, that file will be used. Otherwise,
294 C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
295 -/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>
296 -switch is not specified, no configuration file will be read.
297 +/etc/spamassassin). If that file doesn't exist, and the B<-F> switch
298 +is not specified, no configuration file will be read.
302 diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/README Mail-SpamAssassin-3.4.2/spamd/README
303 --- Mail-SpamAssassin-3.4.2.orig/spamd/README 2018-09-14 03:27:54.000000000 +0200
304 +++ Mail-SpamAssassin-3.4.2/spamd/README 2019-01-26 00:07:45.959000000 +0100
306 If you plan to use Bayesian classification (the BAYES rules) with spamd,
307 you will need to either
309 - 1. modify /etc/mail/spamassassin/local.cf to use a shared database of
310 + 1. modify /etc/spamassassin/local.cf to use a shared database of
311 tokens, by setting the 'bayes_path' setting to a path all users can read
312 and write to. You will also need to set the 'bayes_file_mode' setting
313 to 0666 so that created files are shared, too.
314 diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/README.vpopmail Mail-SpamAssassin-3.4.2/spamd/README.vpopmail
315 --- Mail-SpamAssassin-3.4.2.orig/spamd/README.vpopmail 2018-09-14 03:27:54.000000000 +0200
316 +++ Mail-SpamAssassin-3.4.2/spamd/README.vpopmail 2019-01-26 00:07:45.959000000 +0100
318 /home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
320 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
321 -This is specified in your /etc/mail/spamassassin/local.cf file. Perhaps a
322 +This is specified in your /etc/spamassassin/local.cf file. Perhaps a
323 future enhancement would be to add the capability to have personal AWL db.
325 6. Of course vpopmail must have the seekable patch installed (see
326 diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/spamd.raw Mail-SpamAssassin-3.4.2/spamd/spamd.raw
327 --- Mail-SpamAssassin-3.4.2.orig/spamd/spamd.raw 2018-09-14 03:27:54.000000000 +0200
328 +++ Mail-SpamAssassin-3.4.2/spamd/spamd.raw 2019-01-26 00:07:45.959000000 +0100
329 @@ -3352,7 +3352,7 @@
330 =item B<--siteconfigpath>=I<path>
332 Use the specified path for locating site-specific configuration files. Ignore
333 -the default directories (usually C</etc/mail/spamassassin> or similar).
334 +the default directories (usually C</etc/spamassassin> or similar).
336 =item B<--cf='config line'>
338 diff -ur Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
339 --- Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2018-09-14 03:27:51.000000000 +0200
340 +++ Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2019-01-26 00:11:08.257000000 +0100
344 SANew DEF_RULES_DIR "/usr/share/spamassassin"
345 - SANew LOCAL_RULES_DIR "/etc/mail/spamassassin"
346 + SANew LOCAL_RULES_DIR "/etc/spamassassin"
347 SANew LOCAL_STATE_DIR "/var/lib"
353 SANew DEF_RULES_DIR "/usr/share/spamassassin"
354 - SANew LOCAL_RULES_DIR "/etc/mail/spamassassin"
355 + SANew LOCAL_RULES_DIR "/etc/spamassassin"
356 SANew LOCAL_STATE_DIR "/var/lib"
358 LoadModule ident_module /usr/lib/apache/mod_ident.so
359 diff -ur Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
360 --- Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2018-09-14 03:27:51.000000000 +0200
361 +++ Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2019-01-26 00:11:02.357000000 +0100
363 # substituted at 'make' time
365 DEF_RULES_DIR => '/usr/share/spamassassin',
366 - LOCAL_RULES_DIR => '/etc/mail/spamassassin',
367 + LOCAL_RULES_DIR => '/etc/spamassassin',
368 LOCAL_STATE_DIR => '/var/lib',
371 diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README Mail-SpamAssassin-3.4.2/sql/README
372 --- Mail-SpamAssassin-3.4.2.orig/sql/README 2018-09-14 03:27:52.000000000 +0200
373 +++ Mail-SpamAssassin-3.4.2/sql/README 2019-01-26 00:07:45.959000000 +0100
377 SpamAssassin will check the global configuration file (ie. any file matching
378 -/etc/mail/spamassassin/*.cf) for the following settings:
379 +/etc/spamassassin/*.cf) for the following settings:
381 user_scores_dsn DBI:driver:connection
382 user_scores_sql_username dbusername
383 diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README.awl Mail-SpamAssassin-3.4.2/sql/README.awl
384 --- Mail-SpamAssassin-3.4.2.orig/sql/README.awl 2018-09-14 03:27:52.000000000 +0200
385 +++ Mail-SpamAssassin-3.4.2/sql/README.awl 2019-01-26 00:07:45.960000000 +0100
387 auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList
389 SpamAssassin will check the global configuration file (ie. any file
390 -matching /etc/mail/spamassassin/*.cf) for the following settings:
391 +matching /etc/spamassassin/*.cf) for the following settings:
393 user_awl_dsn DBI:driver:database:hostname[:port]
394 user_awl_sql_username dbusername
395 diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README.txrep Mail-SpamAssassin-3.4.2/sql/README.txrep
396 --- Mail-SpamAssassin-3.4.2.orig/sql/README.txrep 2018-09-14 03:27:52.000000000 +0200
397 +++ Mail-SpamAssassin-3.4.2/sql/README.txrep 2019-01-26 00:10:58.257000000 +0100
399 txrep_factory Mail::SpamAssassin::SQLBasedAddrList
401 SpamAssassin will check the global configuration file (ie. any file
402 -matching /etc/mail/spamassassin/*.cf) for the following settings:
403 +matching /etc/spamassassin/*.cf) for the following settings:
405 user_awl_dsn DBI:driver:database:hostname[:port]
406 user_awl_sql_username dbusername
407 diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/taintcheckplugin.pm Mail-SpamAssassin-3.4.2/t/data/taintcheckplugin.pm
408 --- Mail-SpamAssassin-3.4.2.orig/t/data/taintcheckplugin.pm 2018-09-14 03:27:52.000000000 +0200
409 +++ Mail-SpamAssassin-3.4.2/t/data/taintcheckplugin.pm 2019-01-26 00:10:49.817000000 +0100
411 =head1 taintcheckplugin.pm
413 -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
414 +To try this out, write these lines to /etc/spamassassin/plugintest.cf:
416 loadplugin myTestPlugin
417 header MY_TEST_PLUGIN eval:check_test_plugin()
418 diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/testplugin2.pm Mail-SpamAssassin-3.4.2/t/data/testplugin2.pm
419 --- Mail-SpamAssassin-3.4.2.orig/t/data/testplugin2.pm 2018-09-14 03:27:52.000000000 +0200
420 +++ Mail-SpamAssassin-3.4.2/t/data/testplugin2.pm 2019-01-26 00:10:52.297000000 +0100
422 =head1 testplugin2.pm
424 -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
425 +To try this out, write these lines to /etc/spamassassin/plugintest.cf:
427 loadplugin myTestPlugin
428 header MY_TEST_PLUGIN eval:check_test_plugin()
429 diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/testplugin.pm Mail-SpamAssassin-3.4.2/t/data/testplugin.pm
430 --- Mail-SpamAssassin-3.4.2.orig/t/data/testplugin.pm 2018-09-14 03:27:52.000000000 +0200
431 +++ Mail-SpamAssassin-3.4.2/t/data/testplugin.pm 2019-01-26 00:07:45.960000000 +0100
435 -To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:
436 +To try this out, write these lines to /etc/spamassassin/plugintest.cf:
438 loadplugin myTestPlugin
439 header MY_TEST_PLUGIN eval:check_test_plugin()
440 diff -ur Mail-SpamAssassin-3.4.2.orig/t/sa_compile.t Mail-SpamAssassin-3.4.2/t/sa_compile.t
441 --- Mail-SpamAssassin-3.4.2.orig/t/sa_compile.t 2018-09-14 03:27:53.000000000 +0200
442 +++ Mail-SpamAssassin-3.4.2/t/sa_compile.t 2019-01-26 00:10:40.537000000 +0100
444 system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
446 &new_instdir("basic");
447 -&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/mail/spamassassin");
448 +&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/spamassassin");
450 # we now have an "installed" version we can run sa-compile with. Ensure
451 # sarun() will use it appropriately
454 #Create the dir for the pre file
456 - $file = "$instdir/etc/mail/spamassassin/v330.pre";
457 + $file = "$instdir/etc/spamassassin/v330.pre";
458 $dir = dirname($file);
461 diff -ur Mail-SpamAssassin-3.4.2.orig/UPGRADE Mail-SpamAssassin-3.4.2/UPGRADE
462 --- Mail-SpamAssassin-3.4.2.orig/UPGRADE 2018-09-14 03:27:56.000000000 +0200
463 +++ Mail-SpamAssassin-3.4.2/UPGRADE 2019-01-26 00:07:45.957000000 +0100
465 perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
467 - There are now multiple files read to enable plugins in the
468 - /etc/mail/spamassassin directory; previously only one, "init.pre" was
469 + /etc/spamassassin directory; previously only one, "init.pre" was
470 read. Now both "init.pre", "v310.pre", and any other files ending
471 in ".pre" will be read. As future releases are made, new plugins
472 will be added to new files named according to the release they're
474 - If you are using a UNIX machine with all database files on local disks,
475 and no sharing of those databases across NFS filesystems, you can use a
476 more efficient, but non-NFS-safe, locking mechanism. Do this by adding
477 - the line "lock_method flock" to the /etc/mail/spamassassin/local.cf
478 + the line "lock_method flock" to the /etc/spamassassin/local.cf
479 file. This is strongly recommended if you're not using NFS, as it is
480 much faster than the NFS-safe locker.
482 diff -ur Mail-SpamAssassin-3.4.2.orig/USAGE Mail-SpamAssassin-3.4.2/USAGE
483 --- Mail-SpamAssassin-3.4.2.orig/USAGE 2018-09-14 03:27:55.000000000 +0200
484 +++ Mail-SpamAssassin-3.4.2/USAGE 2019-01-26 00:07:45.957000000 +0100
486 CPU-intensive task before they can send mail to you, so we give that
487 some bonus points. However, it requires that you list what addresses
488 you expect to receive mail for, by adding 'hashcash_accept' lines to
489 - your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
490 + your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf
491 files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for
492 details on how to specify these.
494 @@ -129,14 +129,14 @@
497 - You can create your own system-wide rules files in
498 - /etc/mail/spamassassin; their filenames should end in ".cf". Multiple
499 + /etc/spamassassin; their filenames should end in ".cf". Multiple
500 files will be read, and SpamAssassin will not overwrite these files
501 when installing a new version.
504 - You should not modify the files in /usr/share/spamassassin; these
505 will be overwritten when you upgrade. Any changes you make in
506 - files in the /etc/mail/spamassassin directory, however, will
507 + files in the /etc/spamassassin directory, however, will
508 override these files.