CVS commit: pkgsrc/mail/libspf2

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Thu Oct 15 19:51:20 UTC 2026

Modified Files:
        pkgsrc/mail/libspf2: Makefile distinfo
        pkgsrc/mail/libspf2/patches: patch-src_libspf2_spf__compile.c
Added Files:
        pkgsrc/mail/libspf2/patches: patch-src_include_spf__record.h

Log Message:
libspf2: add patch for longer TXT/SPF records


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/libspf2/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/libspf2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/libspf2/patches/patch-src_include_spf__record.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/libspf2/Makefile
diff -u pkgsrc/mail/libspf2/Makefile:1.20 pkgsrc/mail/libspf2/Makefile:1.21
--- pkgsrc/mail/libspf2/Makefile:1.20   Mon Jan  5 09:22:05 2026
+++ pkgsrc/mail/libspf2/Makefile        Thu Oct 15 19:51:20 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2026/01/05 09:22:05 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2026/10/15 19:51:20 tm Exp $
 
 DISTNAME=              libspf2-1.2.11
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            mail
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 

Index: pkgsrc/mail/libspf2/distinfo
diff -u pkgsrc/mail/libspf2/distinfo:1.16 pkgsrc/mail/libspf2/distinfo:1.17
--- pkgsrc/mail/libspf2/distinfo:1.16   Sat Oct  7 20:12:08 2023
+++ pkgsrc/mail/libspf2/distinfo        Thu Oct 15 19:51:20 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2023/10/07 20:12:08 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2026/10/15 19:51:20 tm Exp $
 
 BLAKE2s (libspf2-1.2.11.tar.gz) = 47156637170752c1f614769befe9c2e384fca3d6d410b3a9f52d437dd1811af3
 SHA512 (libspf2-1.2.11.tar.gz) = 6a9505e68bd0f8b24acc98e8fd3a6815329a367c9a9cd3ec59d69eb6f9d1153fb2d1297f793828340050663a458a9bdb244d77a58253bfa7a3fbf74aadb01dfc
@@ -7,8 +7,9 @@ SHA1 (patch-configure) = fea9a31e989d9ab
 SHA1 (patch-configure.ac) = 825bf95570cfd8be8b7da3711fe2c0dc549d16a1
 SHA1 (patch-src_include_spf__dns.h) = f51a66f5b22c24ba7c95f3aa427e41cc215581e0
 SHA1 (patch-src_include_spf__log.h) = fdf6fe3447f465b364ddaa9f2d78f36458ba0266
+SHA1 (patch-src_include_spf__record.h) = b8c6e7c8a8cd3bf901aca75847792277647ce495
 SHA1 (patch-src_libspf2_Makefile.in) = a7e989902af90d65adc9693159aae73c07df8dcc
-SHA1 (patch-src_libspf2_spf__compile.c) = 06b17348aaf7eb3eaa864587ff4a775c8c5ab79f
+SHA1 (patch-src_libspf2_spf__compile.c) = 83d4a2d2120a7e71f52e40a32141343709bad6d3
 SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10
 SHA1 (patch-src_libspf2_spf__utils.c) = be60c232a45689ec4ba88b0e9e87d899890eaed2
 SHA1 (patch-src_spfquery_spfquery.c) = 3878362c6ab9e4badc2809bbb3a106378244f078

Index: pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c
diff -u pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c:1.1 pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c:1.2
--- pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c:1.1    Sat Oct  7 20:12:08 2023
+++ pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c        Thu Oct 15 19:51:20 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_libspf2_spf__compile.c,v 1.1 2023/10/07 20:12:08 schmonz Exp $
+$NetBSD: patch-src_libspf2_spf__compile.c,v 1.2 2026/10/15 19:51:20 tm Exp $
 
-Apply upstream commit d14abff to fix integer underflow.
+Apply upstream commit d14abff to fix integer underflow. Also handle BIG_MECH
+errors correctly.
 
 --- src/libspf2/spf_compile.c.orig     2021-06-09 05:43:12.000000000 +0000
 +++ src/libspf2/spf_compile.c
@@ -17,3 +18,12 @@ Apply upstream commit d14abff to fix int
                        ds_len = 0;                                                                                             \
                } while(0)
  
+@@ -1411,7 +1415,7 @@ SPF_record_compile(SPF_server_t *spf_ser
+                       err = SPF_c_mech_add(spf_server,
+                                                       spf_record, spf_response,
+                                                       mechtype, prefix, &val_start);
+-                      if (err == SPF_E_NO_MEMORY)
++                      if (err == SPF_E_NO_MEMORY || err == SPF_E_BIG_MECH)
+                               return err;
+                       /* XXX Else do nothing. Continue for the next error. */
+                       /* We shouldn't have to worry about the child function

Added files:

Index: pkgsrc/mail/libspf2/patches/patch-src_include_spf__record.h
diff -u /dev/null pkgsrc/mail/libspf2/patches/patch-src_include_spf__record.h:1.1
--- /dev/null   Thu Oct 15 19:51:20 2026
+++ pkgsrc/mail/libspf2/patches/patch-src_include_spf__record.h Thu Oct 15 19:51:20 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_include_spf__record.h,v 1.1 2026/10/15 19:51:20 tm Exp $
+
+Resize MAX_MECH_LEN for longer TXT/SPF records, especially multiple includes
+and ip6 addresses.
+
+diff --git a/src/include/spf_record.h b/src/include/spf_record.h
+index 00c337a..f273cce 100644
+--- src/include/spf_record.h.orig
++++ src/include/spf_record.h
+@@ -74,7 +74,7 @@ typedef struct SPF_macro_struct SPF_macro_t;
+                                       /* SPF_mod_t.name_len and       */
+                                       /* SPF_mod_t.data_len           */
+ 
+-#define SPF_MAX_MECH_LEN      511
++#define SPF_MAX_MECH_LEN      8192
+ #define SPF_MAX_MOD_LEN               511