Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
mail/spampd: fix used home directory
To:
OpenBSD ports <ports@openbsd.org>
Cc:
Klemens Nanni <kn@openbsd.org>
Date:
Fri, 06 Dec 2024 23:48:59 +0100

Download raw body.

Thread
ports@,

here a fix for mail/spampd to adjust default home directory to really used
one.

If a user installs spampd and runs it, he will discover the following error
for each processed email:

    plugin: eval failed: bayes: (in learn) locker: safe_lock: cannot create tmp lockfile /var/spool/spamassassin/spampd/bayes.lock.mx1.catap.net.47578 for /var/spool/spamassassin/spampd/bayes.lock: Permission denied

Current workaround is adding --homedir option. And if user did it, my fix
won't affect him.

Ok?

Index: mail/spampd/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/spampd/Makefile,v
diff -u -p -r1.14 Makefile
--- mail/spampd/Makefile	8 Nov 2022 11:14:52 -0000	1.14
+++ mail/spampd/Makefile	6 Dec 2024 17:21:31 -0000
@@ -3,7 +3,7 @@ COMMENT=		SMTP/LMTP proxy for Spamassass
 GH_ACCOUNT=		mpaperno
 GH_PROJECT=		spampd
 GH_TAGNAME=		2.61
-REVISION=		0
+REVISION=		1

 CATEGORIES=		mail

Index: mail/spampd/patches/patch-spampd_pl
===================================================================
RCS file: /home/cvs/ports/mail/spampd/patches/patch-spampd_pl,v
diff -u -p -r1.4 patch-spampd_pl
--- mail/spampd/patches/patch-spampd_pl	11 Mar 2022 19:34:57 -0000	1.4
+++ mail/spampd/patches/patch-spampd_pl	6 Dec 2024 17:23:57 -0000
@@ -12,6 +12,15 @@ Index: spampd.pl
        log_file          => undef,                 # log destination (undef means log to use write_to_log_hook() with stderr fallback)
        syslog_logsock    => undef,                 # syslog socket (undef means for Sys::Syslog to decide)
        syslog_ident      => 'spampd',              # syslog identity
+@@ -468,7 +468,7 @@ sub new {
+       debug                => 0,                  # debug flag, can be boolean or a list to pass to SA (--debug option)
+       local_tests_only     => 0,                  # disable SA network tests (--local-only flag)
+       userstate_dir        =>
+-        '/var/spool/spamassassin/spampd',         # home directory for SA files and plugins (--homedir option)
++        '/var/spampd',                            # home directory for SA files and plugins (--homedir option)
+       home_dir_for_helpers => '',                 # this will be set to the same as userstate_dir once options are parsed
+       username             => '',                 # this will be set to the same user as we're running as once options are parsed
+       userprefs_filename   => undef,              # add this config file for SA "user_prefs" settings (--saconfig option)
 @@ -2080,7 +2080,7 @@ Specifies what UNIX socket spampd will relay to. If th
  =item B<--group> or B<-g> I<<groupname>>



--
wbr, Kirill