Sat Oct 7 20:12:08 2023 UTC ()
libspf2: apply upstream integer-underflow fix. Bump PKGREVISION.


(schmonz)
diff -r1.17 -r1.18 pkgsrc/mail/libspf2/Makefile
diff -r1.15 -r1.16 pkgsrc/mail/libspf2/distinfo
diff -r0 -r1.1 pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c
cvs diff -r1.17 -r1.18 pkgsrc/mail/libspf2/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/libspf2/Makefile 2023/06/02 15:58:46 1.17
+++ pkgsrc/mail/libspf2/Makefile 2023/10/07 20:12:08 1.18
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2023/06/02 15:58:46 schmonz Exp $ 1# $NetBSD: Makefile,v 1.18 2023/10/07 20:12:08 schmonz Exp $
2 2
3DISTNAME= libspf2-1.2.11 3DISTNAME= libspf2-1.2.11
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_LOCAL} 6MASTER_SITES= ${MASTER_SITE_LOCAL}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.libspf2.org/ 9HOMEPAGE= https://www.libspf2.org/
10COMMENT= Implementation of the Sender Policy Framework 10COMMENT= Implementation of the Sender Policy Framework
11LICENSE= modified-bsd OR gnu-lgpl-v2.1 11LICENSE= modified-bsd OR gnu-lgpl-v2.1
12 12
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14USE_LIBTOOL= YES 14USE_LIBTOOL= YES
15 15
16CONFLICTS+= libspf_alt-[0-9]* 16CONFLICTS+= libspf_alt-[0-9]*
17 17
cvs diff -r1.15 -r1.16 pkgsrc/mail/libspf2/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/libspf2/distinfo 2023/06/02 15:57:57 1.15
+++ pkgsrc/mail/libspf2/distinfo 2023/10/07 20:12:08 1.16
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.15 2023/06/02 15:57:57 schmonz Exp $ 1$NetBSD: distinfo,v 1.16 2023/10/07 20:12:08 schmonz Exp $
2 2
3BLAKE2s (libspf2-1.2.11.tar.gz) = 47156637170752c1f614769befe9c2e384fca3d6d410b3a9f52d437dd1811af3 3BLAKE2s (libspf2-1.2.11.tar.gz) = 47156637170752c1f614769befe9c2e384fca3d6d410b3a9f52d437dd1811af3
4SHA512 (libspf2-1.2.11.tar.gz) = 6a9505e68bd0f8b24acc98e8fd3a6815329a367c9a9cd3ec59d69eb6f9d1153fb2d1297f793828340050663a458a9bdb244d77a58253bfa7a3fbf74aadb01dfc 4SHA512 (libspf2-1.2.11.tar.gz) = 6a9505e68bd0f8b24acc98e8fd3a6815329a367c9a9cd3ec59d69eb6f9d1153fb2d1297f793828340050663a458a9bdb244d77a58253bfa7a3fbf74aadb01dfc
5Size (libspf2-1.2.11.tar.gz) = 530879 bytes 5Size (libspf2-1.2.11.tar.gz) = 530879 bytes
6SHA1 (patch-configure) = fea9a31e989d9ab36070a36e508ca44bc1f0af9e 6SHA1 (patch-configure) = fea9a31e989d9ab36070a36e508ca44bc1f0af9e
7SHA1 (patch-configure.ac) = 825bf95570cfd8be8b7da3711fe2c0dc549d16a1 7SHA1 (patch-configure.ac) = 825bf95570cfd8be8b7da3711fe2c0dc549d16a1
8SHA1 (patch-src_include_spf__dns.h) = f51a66f5b22c24ba7c95f3aa427e41cc215581e0 8SHA1 (patch-src_include_spf__dns.h) = f51a66f5b22c24ba7c95f3aa427e41cc215581e0
9SHA1 (patch-src_include_spf__log.h) = fdf6fe3447f465b364ddaa9f2d78f36458ba0266 9SHA1 (patch-src_include_spf__log.h) = fdf6fe3447f465b364ddaa9f2d78f36458ba0266
10SHA1 (patch-src_libspf2_Makefile.in) = a7e989902af90d65adc9693159aae73c07df8dcc 10SHA1 (patch-src_libspf2_Makefile.in) = a7e989902af90d65adc9693159aae73c07df8dcc
 11SHA1 (patch-src_libspf2_spf__compile.c) = 06b17348aaf7eb3eaa864587ff4a775c8c5ab79f
11SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10 12SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10
12SHA1 (patch-src_libspf2_spf__utils.c) = be60c232a45689ec4ba88b0e9e87d899890eaed2 13SHA1 (patch-src_libspf2_spf__utils.c) = be60c232a45689ec4ba88b0e9e87d899890eaed2
13SHA1 (patch-src_spfquery_spfquery.c) = 3878362c6ab9e4badc2809bbb3a106378244f078 14SHA1 (patch-src_spfquery_spfquery.c) = 3878362c6ab9e4badc2809bbb3a106378244f078
File Added: pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c
$NetBSD: patch-src_libspf2_spf__compile.c,v 1.1 2023/10/07 20:12:08 schmonz Exp $

Apply upstream commit d14abff to fix integer underflow.

--- src/libspf2/spf_compile.c.orig	2021-06-09 05:43:12.000000000 +0000
+++ src/libspf2/spf_compile.c
@@ -455,7 +455,11 @@ SPF_c_parse_var(SPF_response_t *spf_resp
 			/* Magic numbers for x/Nc in gdb. */					\
 			data->ds.__unused0 = 0xba; data->ds.__unused1 = 0xbe;	\
 			dst = SPF_data_str( data );								\
-			ds_avail = _avail - sizeof(SPF_data_t);					\
+			if ((_avail) < sizeof(SPF_data_t))						\
+				return SPF_response_add_error_ptr(spf_response,		\
+									SPF_E_BIG_STRING, NULL, src,	\
+								"Out of memory for string literal");\
+			ds_avail = (_avail) - sizeof(SPF_data_t);				\
 			ds_len = 0;												\
 		} while(0)