From 9f3cb91c91e4fc96da1b9949eac7a5350729ce9b Mon Sep 17 00:00:00 2001
From: kirill <kirill@openbsd.org>
Date: Sat, 21 Dec 2024 17:26:26 +0000
Subject: [PATCH] mail/spampd: update to 2.62

Changes:
 * Fixed that SpamPD shares the same socket to `redist` between children.
 * Fix option names in configuration parameter validation methods
 ~ Do not set up logging if only showing debug info

OK: tim@
---
 mail/spampd/Makefile                | 8 +++++---
 mail/spampd/distinfo                | 4 ++--
 mail/spampd/patches/patch-spampd_pl | 4 ++--
 mail/spampd/pkg/PLIST               | 5 +++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mail/spampd/Makefile b/mail/spampd/Makefile
index ac28a9e7ddf..e195d1be911 100644
--- a/mail/spampd/Makefile
+++ b/mail/spampd/Makefile
@@ -2,12 +2,11 @@ COMMENT=		SMTP/LMTP proxy for Spamassassin
 
 GH_ACCOUNT=		mpaperno
 GH_PROJECT=		spampd
-GH_TAGNAME=		2.61
-REVISION=		0
+GH_TAGNAME=		2.62
 
 CATEGORIES=		mail
 
-HOMEPAGE=		http://www.worlddesign.com/index.cfm/page/rd/mta/spampd.htm
+HOMEPAGE=		http://www.worlddesign.com/index.cfm/page/software/open-source/spampd.htm
 
 # GPLv3+
 PERMIT_PACKAGE=	Yes
@@ -24,5 +23,8 @@ do-install:
 		pod2man --section=8 --center="Spam Proxy Daemon" spampd.pl > spampd.8
 	${INSTALL_MAN} ${WRKBUILD}/spampd.8 ${PREFIX}/man/man8/spampd.8
 	${INSTALL_SCRIPT} ${WRKSRC}/spampd.pl ${PREFIX}/sbin/spampd
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/spampd
+	${INSTALL_DATA} ${WRKSRC}/misc/spampd.cfg ${PREFIX}/share/examples/spampd
+	${INSTALL_DATA} ${WRKSRC}/misc/spampd-sm.cfg ${PREFIX}/share/examples/spampd
 
 .include <bsd.port.mk>
diff --git a/mail/spampd/distinfo b/mail/spampd/distinfo
index d73a3381991..727ae33e604 100644
--- a/mail/spampd/distinfo
+++ b/mail/spampd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spampd-2.61.tar.gz) = keYPEHRepPnCe55XYZob8karmojqG4jE85+K9gfi264=
-SIZE (spampd-2.61.tar.gz) = 246956
+SHA256 (spampd-2.62.tar.gz) = 7+AW0RH4wglPSTby76FspueMG0hUZbJp/FxCc7nFfPg=
+SIZE (spampd-2.62.tar.gz) = 249062
diff --git a/mail/spampd/patches/patch-spampd_pl b/mail/spampd/patches/patch-spampd_pl
index 16a4689d072..82d9e293429 100644
--- a/mail/spampd/patches/patch-spampd_pl
+++ b/mail/spampd/patches/patch-spampd_pl
@@ -1,7 +1,7 @@
 Index: spampd.pl
 --- spampd.pl.orig
 +++ spampd.pl
-@@ -429,8 +429,8 @@ sub new {
+@@ -430,8 +430,8 @@ sub new {
        max_servers       => 5,                     # max number of child processes (servers) to spawn
        max_requests      => 20,                    # max requests handled by child b4 dying
        pid_file          => '/var/run/spampd.pid', # write pid to file
@@ -12,7 +12,7 @@ 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
-@@ -2080,7 +2080,7 @@ Specifies what UNIX socket spampd will relay to. If th
+@@ -2087,7 +2087,7 @@ Specifies what UNIX socket spampd will relay to. If th
  =item B<--group> or B<-g> I<<groupname>>
  
  Specifies the user and/or group that the proxy will run as. Default is
diff --git a/mail/spampd/pkg/PLIST b/mail/spampd/pkg/PLIST
index 70c62299f37..178bcce6b39 100644
--- a/mail/spampd/pkg/PLIST
+++ b/mail/spampd/pkg/PLIST
@@ -8,3 +8,8 @@ sbin/spampd
 @owner _spampd
 @group _spampd
 @sample /var/spampd/
+@owner
+@group
+share/examples/spampd/
+share/examples/spampd/spampd-sm.cfg
+share/examples/spampd/spampd.cfg