Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E808484D6B for ; Sat, 7 Oct 2023 20:12:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QrH4Kyzj4gIK for ; Sat, 7 Oct 2023 20:12:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 548A584CD9 for ; Sat, 7 Oct 2023 20:12:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 517FFFADB; Sat, 7 Oct 2023 20:12:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1696709528230290" MIME-Version: 1.0 Date: Sat, 7 Oct 2023 20:12:08 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/libspf2 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231007201208.517FFFADB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1696709528230290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Oct 7 20:12:08 UTC 2023 Modified Files: pkgsrc/mail/libspf2: Makefile distinfo Added Files: pkgsrc/mail/libspf2/patches: patch-src_libspf2_spf__compile.c Log Message: libspf2: apply upstream integer-underflow fix. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/libspf2/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/libspf2/distinfo cvs rdiff -u -r0 -r1.1 \ 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. --_----------=_1696709528230290 Content-Disposition: inline Content-Length: 2898 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/libspf2/Makefile diff -u pkgsrc/mail/libspf2/Makefile:1.17 pkgsrc/mail/libspf2/Makefile:1.18 --- pkgsrc/mail/libspf2/Makefile:1.17 Fri Jun 2 15:58:46 2023 +++ pkgsrc/mail/libspf2/Makefile Sat Oct 7 20:12:08 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2023/06/02 15:58:46 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2023/10/07 20:12:08 schmonz Exp $ DISTNAME= libspf2-1.2.11 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_LOCAL} Index: pkgsrc/mail/libspf2/distinfo diff -u pkgsrc/mail/libspf2/distinfo:1.15 pkgsrc/mail/libspf2/distinfo:1.16 --- pkgsrc/mail/libspf2/distinfo:1.15 Fri Jun 2 15:57:57 2023 +++ pkgsrc/mail/libspf2/distinfo Sat Oct 7 20:12:08 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2023/06/02 15:57:57 schmonz Exp $ +$NetBSD: distinfo,v 1.16 2023/10/07 20:12:08 schmonz Exp $ BLAKE2s (libspf2-1.2.11.tar.gz) = 47156637170752c1f614769befe9c2e384fca3d6d410b3a9f52d437dd1811af3 SHA512 (libspf2-1.2.11.tar.gz) = 6a9505e68bd0f8b24acc98e8fd3a6815329a367c9a9cd3ec59d69eb6f9d1153fb2d1297f793828340050663a458a9bdb244d77a58253bfa7a3fbf74aadb01dfc @@ -8,6 +8,7 @@ SHA1 (patch-configure.ac) = 825bf95570cf SHA1 (patch-src_include_spf__dns.h) = f51a66f5b22c24ba7c95f3aa427e41cc215581e0 SHA1 (patch-src_include_spf__log.h) = fdf6fe3447f465b364ddaa9f2d78f36458ba0266 SHA1 (patch-src_libspf2_Makefile.in) = a7e989902af90d65adc9693159aae73c07df8dcc +SHA1 (patch-src_libspf2_spf__compile.c) = 06b17348aaf7eb3eaa864587ff4a775c8c5ab79f SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10 SHA1 (patch-src_libspf2_spf__utils.c) = be60c232a45689ec4ba88b0e9e87d899890eaed2 SHA1 (patch-src_spfquery_spfquery.c) = 3878362c6ab9e4badc2809bbb3a106378244f078 Added files: Index: pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c diff -u /dev/null pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c:1.1 --- /dev/null Sat Oct 7 20:12:08 2023 +++ pkgsrc/mail/libspf2/patches/patch-src_libspf2_spf__compile.c Sat Oct 7 20:12:08 2023 @@ -0,0 +1,19 @@ +$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) + --_----------=_1696709528230290--