From 3fcbd5f0a9577bba0f701fb23cecf5730fe60491 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 30 May 2026 13:10:44 +0000
Subject: [PATCH] update to clamsmtp-1.10.2, update HOMEPAGE/SITES to fix,
 patch some obvious issues

---
 mail/clamsmtp/Makefile                        |  7 +++----
 mail/clamsmtp/distinfo                        |  4 ++--
 mail/clamsmtp/patches/patch-common_smtppass_h | 12 +++++++++++
 mail/clamsmtp/patches/patch-common_sock_any_c | 20 +++++++++++++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 mail/clamsmtp/patches/patch-common_smtppass_h
 create mode 100644 mail/clamsmtp/patches/patch-common_sock_any_c

diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index 3644e2312c3..d2ca77c6160 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,10 +1,9 @@
 COMMENT=	SMTP virus filter
 
-DISTNAME=	clamsmtp-1.10
-CATEGORIES=    	mail
-
-HOMEPAGE=	http://memberwebs.com/stef/software/clamsmtp/
+DISTNAME=	clamsmtp-1.10.2
+CATEGORIES=	mail
 
+HOMEPAGE=	http://thewalter.net/stef/software/clamsmtp/
 SITES=		${HOMEPAGE}
 
 RUN_DEPENDS=	security/clamav
diff --git a/mail/clamsmtp/distinfo b/mail/clamsmtp/distinfo
index 523d27d7bf3..a2e5a3120a1 100644
--- a/mail/clamsmtp/distinfo
+++ b/mail/clamsmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamsmtp-1.10.tar.gz) = pS/bSybhHs4wxHioBslbHtoW9Oc5N71WDs5wF/sN+So=
-SIZE (clamsmtp-1.10.tar.gz) = 217126
+SHA256 (clamsmtp-1.10.2.tar.gz) = kWkEXWI92Wtm0n3mjqKN6xVsPdpB8RXVt5gwjRUWnMI=
+SIZE (clamsmtp-1.10.2.tar.gz) = 210394
diff --git a/mail/clamsmtp/patches/patch-common_smtppass_h b/mail/clamsmtp/patches/patch-common_smtppass_h
new file mode 100644
index 00000000000..ff8c3e358ef
--- /dev/null
+++ b/mail/clamsmtp/patches/patch-common_smtppass_h
@@ -0,0 +1,12 @@
+Index: common/smtppass.h
+--- common/smtppass.h.orig
++++ common/smtppass.h
+@@ -71,7 +71,7 @@ typedef struct spio
+     char localname[MAXPATHLEN];         /* Address where we accepted the connection */
+     
+     /* Internal use only */
+-    char line[SP_LINE_LENGTH];  
++    char line[SP_LINE_LENGTH + 1];	/* space for trailing nul */
+     char* _nx;
+     size_t _ln;                         
+ }
diff --git a/mail/clamsmtp/patches/patch-common_sock_any_c b/mail/clamsmtp/patches/patch-common_sock_any_c
new file mode 100644
index 00000000000..50debb25d92
--- /dev/null
+++ b/mail/clamsmtp/patches/patch-common_sock_any_c
@@ -0,0 +1,20 @@
+Index: common/sock_any.c
+--- common/sock_any.c.orig
++++ common/sock_any.c
+@@ -367,14 +367,14 @@ int sock_any_cmp(const struct sockaddr_any* a1, const 
+     case AF_INET:
+         if(memcmp(&(a1->s.in.sin_addr), &(a2->s.in.sin_addr), sizeof(a2->s.in.sin_addr)) != 0)
+             return -1;
+-        if(!(opts && SANY_OPT_NOPORT) && a1->s.in.sin_port != a2->s.in.sin_port)
++        if(!(opts & SANY_OPT_NOPORT) && a1->s.in.sin_port != a2->s.in.sin_port)
+             return -1;
+         return 0;
+ #ifdef HAVE_INET6        
+     case AF_INET6:
+         if(memcmp(&(a1->s.in6.sin6_addr), &(a2->s.in6.sin6_addr), sizeof(a2->s.in6.sin6_addr)) != 0)
+             return -1;
+-        if(!(opts && SANY_OPT_NOPORT) && a1->s.in6.sin6_port != a2->s.in6.sin6_port)
++        if(!(opts & SANY_OPT_NOPORT) && a1->s.in6.sin6_port != a2->s.in6.sin6_port)
+             return -1;
+         return 0;
+ #endif