summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-12-02 12:36:00 +0000
committergrant <grant@pkgsrc.org>2003-12-02 12:36:00 +0000
commit698d0e2d6ce329a8481f5a55d0b16c9262efeafe (patch)
tree6b88f92f0255d0676d1b305d266010b1f4b209da /mail
parent5101b874e7e20baa557a75be0d6b7213e3f61be9 (diff)
downloadpkgsrc-698d0e2d6ce329a8481f5a55d0b16c9262efeafe.tar.gz
print correct path to config files in spamd usage message.
Diffstat (limited to 'mail')
-rw-r--r--mail/spamassassin/distinfo4
-rw-r--r--mail/spamassassin/patches/patch-ae28
2 files changed, 28 insertions, 4 deletions
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index db8e247992c..7eff3d19c46 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2003/12/01 16:04:40 heinz Exp $
+$NetBSD: distinfo,v 1.19 2003/12/02 12:36:00 grant Exp $
SHA1 (Mail-SpamAssassin-2.60.tar.gz) = 5d42b39430da13443dd94e78a2dad6c2b1c7cb5a
Size (Mail-SpamAssassin-2.60.tar.gz) = 963215 bytes
SHA1 (patch-ab) = 9f9d17bd2416584a693ef4757b2211968581983e
-SHA1 (patch-ae) = e87cdced71467baccdc1b6b837a350c6fa7e596f
+SHA1 (patch-ae) = 4067380489f19fcbe76da56aa53fe2c9cdd396ee
SHA1 (patch-ak) = 1b4669ec7ba136234c7d4be73e7ddfedab523be8
SHA1 (patch-al) = 75c22289726d3c7e39834cd164ca9f2220969e9e
SHA1 (patch-aq) = c8401a1e609707754b781a98358b2dd93638840e
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index ae8ad1be549..20941188540 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2003/11/03 00:56:26 heinz Exp $
+$NetBSD: patch-ae,v 1.7 2003/12/02 12:36:00 grant Exp $
---- spamd/spamd.raw.orig Thu Sep 11 03:05:22 2003
+--- spamd/spamd.raw.orig 2003-09-11 11:05:22.000000000 +1000
+++ spamd/spamd.raw
@@ -207,8 +207,8 @@ if ($opt{'auth-ident'}) {
}
@@ -25,3 +25,27 @@ $NetBSD: patch-ae,v 1.6 2003/11/03 00:56:26 heinz Exp $
# Be a nice daemon and chdir() to the root so we don't block any unmount attempts
chdir '/' or die "Can't chdir to /: $!\n";
+@@ -1341,7 +1342,7 @@ Options:
+ -a, --auto-whitelist, --whitelist Use auto-whitelists
+ -c, --create-prefs Create user preferences files
+ -C path, --configpath=path Path for default config files
+- --siteconfigpath=path Path for site configs (def: /etc/mail/spamassassin)
++ --siteconfigpath=path Path for site configs (def: @@LOCAL_RULES_DIR@@)
+ -d, --daemonize Daemonize
+ -h, --help Print usage message.
+ -i ipaddr, --listen-ip=ipaddr,... Listen on the IP ipaddr (default: 127.0.0.1)
+@@ -1416,12 +1417,12 @@ Create user preferences files if they do
+ =item B<-C> I<path>, B<--configpath>=I<path>
+
+ Use the specified path for locating the distributed configuration files.
+-Ignore the default directories (usually C</usr/share/spamassassin> or similar).
++Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
+
+ =item B<--siteconfigpath>=I<path>
+
+ Use the specified path for locating site-specific configuration files. Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
+
+ =item B<-d>, B<--daemonize>
+