#! /bin/sh -e ## 10_edit_config_paths.dpatch by Duncan Findlay ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Change all instances of /etc/mail/spamassassin in the documentation ## DP: to /etc/spamassassin, since thats where the configuration is going. if [ $# -lt 1 ]; then echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 exit 1 fi [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" case "$1" in -patch) patch -p1 ${patch_opts} < $0;; -unpatch) patch -R -p1 ${patch_opts} < $0;; *) echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 exit 1;; esac exit 0 @DPATCH@ diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/ldap/README spamassassin-3.0.0/ldap/README --- /home/duncf/svn/debian/spamassassin-3.0.0/ldap/README 2004-09-13 19:34:02.000000000 -0400 +++ spamassassin-3.0.0/ldap/README 2004-09-23 00:56:35.000000000 -0400 @@ -13,7 +13,7 @@ database or LDAP server. SpamAssassin will check the global configuration file (ie. any file matching -/etc/mail/spamassassin/*.cf) for the following settings: +/etc/spamassassin/*.cf) for the following settings: user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__ user_scores_ldap_username bind dn diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/lib/Mail/SpamAssassin/Conf.pm spamassassin-3.0.0/lib/Mail/SpamAssassin/Conf.pm --- /home/duncf/svn/debian/spamassassin-3.0.0/lib/Mail/SpamAssassin/Conf.pm 2004-09-21 16:51:34.000000000 -0400 +++ spamassassin-3.0.0/lib/Mail/SpamAssassin/Conf.pm 2004-09-23 00:56:35.000000000 -0400 @@ -37,7 +37,7 @@ =head1 DESCRIPTION SpamAssassin is configured using traditional UNIX-style configuration files, -loaded from the C and C +loaded from the C and C directories. The C<#> character starts a comment, which continues until end of line. @@ -1959,7 +1959,7 @@ These settings differ from the ones above, in that they are considered 'privileged'. Only users running C from their procmailrc's or -forward files, or sysadmins editing a file in C, can +forward files, or sysadmins editing a file in C, can use them. C users cannot use them in their C files, for security and efficiency reasons, unless C is enabled (and then, they may only add rules from below). diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/lib/Mail/SpamAssassin/Plugin/Test.pm spamassassin-3.0.0/lib/Mail/SpamAssassin/Plugin/Test.pm --- /home/duncf/svn/debian/spamassassin-3.0.0/lib/Mail/SpamAssassin/Plugin/Test.pm 2004-08-27 12:37:33.000000000 -0400 +++ spamassassin-3.0.0/lib/Mail/SpamAssassin/Plugin/Test.pm 2004-09-23 00:56:35.000000000 -0400 @@ -26,7 +26,7 @@ =head1 DESCRIPTION To try this plugin, write the above two lines in the synopsis to -C. +C. =cut diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/README spamassassin-3.0.0/README --- /home/duncf/svn/debian/spamassassin-3.0.0/README 2004-09-09 14:29:20.000000000 -0400 +++ spamassassin-3.0.0/README 2004-09-23 00:56:35.000000000 -0400 @@ -81,7 +81,7 @@ Distributed configuration files, with all defaults. Do not modify these, as they are overwritten when you upgrade. - - /etc/mail/spamassassin/*.cf: + - /etc/spamassassin/*.cf: Site config files, for system admins to create, modify, and add local rules and scores to. Modifications here will be @@ -92,14 +92,14 @@ Distributed default user preferences. Do not modify this, as it is overwritten when you upgrade. - - /etc/mail/spamassassin/user_prefs.template: + - /etc/spamassassin/user_prefs.template: Default user preferences, for system admins to create, modify, and set defaults for users' preferences files. Takes precedence over the above prefs file, if it exists. Do not put system-wide settings in here; put them in a file in the - "/etc/mail/spamassassin" directory ending in ".cf". This file is + "/etc/spamassassin" directory ending in ".cf". This file is just a template, which will be copied to a user's home directory for them to change. diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/rules/30_text_fr.cf spamassassin-3.0.0/rules/30_text_fr.cf --- /home/duncf/svn/debian/spamassassin-3.0.0/rules/30_text_fr.cf 2004-09-09 14:29:20.000000000 -0400 +++ spamassassin-3.0.0/rules/30_text_fr.cf 2004-09-23 00:56:35.000000000 -0400 @@ -4,7 +4,7 @@ # Latest revision: 2003/11/14 # # Please don't modify this file as your changes will be overwritten with -# the next update. Use /etc/mail/spamassassin/local.cf instead. +# the next update. Use /etc/spamassassin/local.cf instead. # See 'perldoc Mail::SpamAssassin::Conf' for details. # # <@LICENSE> diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/rules/user_prefs.template spamassassin-3.0.0/rules/user_prefs.template --- /home/duncf/svn/debian/spamassassin-3.0.0/rules/user_prefs.template 2004-08-27 12:37:35.000000000 -0400 +++ spamassassin-3.0.0/rules/user_prefs.template 2004-09-23 00:56:35.000000000 -0400 @@ -5,7 +5,7 @@ #* directory. At runtime, if a user has no preferences in their home directory #* already, it will be copied for them, allowing them to perform personalised #* customisation. If you want to make changes to the site-wide defaults, -#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead. +#* create a file in /etc/spamassassin instead. ########################################################################### # How many points before a mail is considered spam. diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/sa-learn.raw spamassassin-3.0.0/sa-learn.raw --- /home/duncf/svn/debian/spamassassin-3.0.0/sa-learn.raw 2004-08-27 12:37:32.000000000 -0400 +++ spamassassin-3.0.0/sa-learn.raw 2004-09-23 00:56:35.000000000 -0400 @@ -518,7 +518,7 @@ -C path, --configpath=path, --config-file=path Path to standard configuration dir -p prefs, --prefspath=file, --prefs-file=file Set user preferences file - --siteconfigpath=path Path for site configs (def: /etc/mail/spamassassin) + --siteconfigpath=path Path for site configs (def: /etc/spamassassin) -D, --debug-level Print debugging messages -V, --version Print version -h, --help Print usage message @@ -645,7 +645,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore -the default directories (usually C or similar). +the default directories (usually C or similar). =item B<-p> I, B<--prefspath>=I, B<--prefs-file>=I diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/lib/spamassassin-run.pod spamassassin-3.0.0/lib/spamassassin-run.pod --- /home/duncf/svn/debian/spamassassin-3.0.0/lib/spamassassin-run.pod 2004-09-13 19:34:05.000000000 -0400 +++ spamassassin-3.0.0/lib/spamassassin-run.pod 2004-09-23 00:56:35.000000000 -0400 @@ -470,7 +470,7 @@ -p prefs, --prefspath=file, --prefs-file=file Set user preferences file --siteconfigpath=path Path for site configs - (def: /etc/mail/spamassassin) + (def: /etc/spamassassin) -x, --nocreate-prefs Don't create user preferences file -e, --exit-code Exit with a non-zero exit code if the tested message was spam @@ -659,7 +659,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore -the default directories (usually C or similar). +the default directories (usually C or similar). =item B<-p> I, B<--prefspath>=I, B<--prefs-file>=I diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/spamd/README spamassassin-3.0.0/spamd/README --- /home/duncf/svn/debian/spamassassin-3.0.0/spamd/README 2004-08-27 12:37:43.000000000 -0400 +++ spamassassin-3.0.0/spamd/README 2004-09-23 00:56:35.000000000 -0400 @@ -105,7 +105,7 @@ If you plan to use Bayesian classification (the BAYES rules) with spamd, you will need to either - 1. modify /etc/mail/spamassassin/local.cf to use a shared database of + 1. modify /etc/spamassassin/local.cf to use a shared database of tokens, by setting the 'bayes_path' setting to a path all users can read and write to. You will also need to set the 'bayes_file_mode' setting to 0666 so that created files are shared, too. diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/spamd/README.vpopmail spamassassin-3.0.0/spamd/README.vpopmail --- /home/duncf/svn/debian/spamassassin-3.0.0/spamd/README.vpopmail 2004-08-27 12:37:43.000000000 -0400 +++ spamassassin-3.0.0/spamd/README.vpopmail 2004-09-23 00:56:35.000000000 -0400 @@ -43,7 +43,7 @@ /home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work. -This is specified in your /etc/mail/spamassassin/local.cf file. Perhaps a +This is specified in your /etc/spamassassin/local.cf file. Perhaps a future enhancement would be to add the capability to have personal AWL db. 6. Of course vpopmail must have the seekable patch installed (see diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/spamd/spamd.raw spamassassin-3.0.0/spamd/spamd.raw --- /home/duncf/svn/debian/spamassassin-3.0.0/spamd/spamd.raw 2004-09-13 19:34:05.000000000 -0400 +++ spamassassin-3.0.0/spamd/spamd.raw 2004-09-23 00:56:35.000000000 -0400 @@ -1992,7 +1992,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore -the default directories (usually C or similar). +the default directories (usually C or similar). =item B<-d>, B<--daemonize> diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/sql/README spamassassin-3.0.0/sql/README --- /home/duncf/svn/debian/spamassassin-3.0.0/sql/README 2004-09-04 00:19:26.000000000 -0400 +++ spamassassin-3.0.0/sql/README 2004-09-23 00:56:35.000000000 -0400 @@ -15,7 +15,7 @@ required_score, and auto_report_threshold. SpamAssassin will check the global configuration file (ie. any file matching -/etc/mail/spamassassin/*.cf) for the following settings: +/etc/spamassassin/*.cf) for the following settings: user_scores_dsn DBI:driver:connection user_scores_sql_username dbusername diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/sql/README.awl spamassassin-3.0.0/sql/README.awl --- /home/duncf/svn/debian/spamassassin-3.0.0/sql/README.awl 2004-08-27 12:37:37.000000000 -0400 +++ spamassassin-3.0.0/sql/README.awl 2004-09-23 00:56:35.000000000 -0400 @@ -15,7 +15,7 @@ auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList SpamAssassin will check the global configuration file (ie. any file -matching /etc/mail/spamassassin/*.cf) for the following settings: +matching /etc/spamassassin/*.cf) for the following settings: user_awl_dsn DBI:driver:database:hostname[:port] user_awl_sql_username dbusername diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/UPGRADE spamassassin-3.0.0/UPGRADE --- /home/duncf/svn/debian/spamassassin-3.0.0/UPGRADE 2004-09-04 00:19:25.000000000 -0400 +++ spamassassin-3.0.0/UPGRADE 2004-09-23 00:56:35.000000000 -0400 @@ -70,7 +70,7 @@ - If you are using a UNIX machine with all database files on local disks, and no sharing of those databases across NFS filesystems, you can use a more efficient, but non-NFS-safe, locking mechanism. Do this by adding - the line "lock_method flock" to the /etc/mail/spamassassin/local.cf + the line "lock_method flock" to the /etc/spamassassin/local.cf file. This is strongly recommended if you're not using NFS, as it is much faster than the NFS-safe locker. diff -urNad /home/duncf/svn/debian/spamassassin-3.0.0/USAGE spamassassin-3.0.0/USAGE --- /home/duncf/svn/debian/spamassassin-3.0.0/USAGE 2004-08-27 12:37:43.000000000 -0400 +++ spamassassin-3.0.0/USAGE 2004-09-23 00:56:35.000000000 -0400 @@ -116,7 +116,7 @@ CPU-intensive task before they can send mail to you, so we give that some bonus points. However, it requires that you list what addresses you expect to receive mail for, by adding 'hashcash_accept' lines to - your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf + your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for details on how to specify these. @@ -127,14 +127,14 @@ - You can create your own system-wide rules files in - /etc/mail/spamassassin; their filenames should end in ".cf". Multiple + /etc/spamassassin; their filenames should end in ".cf". Multiple files will be read, and SpamAssassin will not overwrite these files when installing a new version. - You should not modify the files in /usr/share/spamassassin; these will be overwritten when you upgrade. Any changes you make in - files in the /etc/mail/spamassassin directory, however, will + files in the /etc/spamassassin directory, however, will override these files.