CVS commit: pkgsrc/mail/libspf2

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat Apr  2 21:41:39 UTC 2022

Modified Files:
        pkgsrc/mail/libspf2: Makefile distinfo
        pkgsrc/mail/libspf2/patches: patch-src_include_spf__log.h

Log Message:
libspf2-1.2.11 from
https://github.com/shevek/libspf2/commit/c37b7c13c30e225183899364b9f2efdfa85552ef

fixes CVE-2021-33912, CVE-2021-33913 and CVE-2021-33914


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/libspf2/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/libspf2/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/libspf2/patches/patch-src_include_spf__log.h

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.14 pkgsrc/mail/libspf2/Makefile:1.15
--- pkgsrc/mail/libspf2/Makefile:1.14   Wed Aug 16 20:21:10 2017
+++ pkgsrc/mail/libspf2/Makefile        Sat Apr  2 21:41:38 2022
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2017/08/16 20:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/04/02 21:41:38 spz Exp $
 
-DISTNAME=      libspf2-1.2.10
-PKGREVISION=   1
+DISTNAME=      libspf2-1.2.11
 CATEGORIES=    mail
-MASTER_SITES=  https://www.libspf2.org/spf/
+MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.libspf2.org/

Index: pkgsrc/mail/libspf2/distinfo
diff -u pkgsrc/mail/libspf2/distinfo:1.13 pkgsrc/mail/libspf2/distinfo:1.14
--- pkgsrc/mail/libspf2/distinfo:1.13   Tue Oct 26 10:54:05 2021
+++ pkgsrc/mail/libspf2/distinfo        Sat Apr  2 21:41:38 2022
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:54:05 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/04/02 21:41:38 spz Exp $
 
-BLAKE2s (libspf2-1.2.10.tar.gz) = 5d6334413947d087d5bddbc24012899b660f9894328d6840816be74eaf4ccb86
-SHA512 (libspf2-1.2.10.tar.gz) = 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-Size (libspf2-1.2.10.tar.gz) = 508842 bytes
+BLAKE2s (libspf2-1.2.11.tar.gz) = 47156637170752c1f614769befe9c2e384fca3d6d410b3a9f52d437dd1811af3
+SHA512 (libspf2-1.2.11.tar.gz) = 6a9505e68bd0f8b24acc98e8fd3a6815329a367c9a9cd3ec59d69eb6f9d1153fb2d1297f793828340050663a458a9bdb244d77a58253bfa7a3fbf74aadb01dfc
+Size (libspf2-1.2.11.tar.gz) = 530879 bytes
 SHA1 (patch-configure) = 0005180f6b9aedc45663dee6764c438d33078359
 SHA1 (patch-configure.ac) = eb0fae2a2bbe86f0e54b56c3ab2ec696f9a6788c
-SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed
+SHA1 (patch-src_include_spf__log.h) = fdf6fe3447f465b364ddaa9f2d78f36458ba0266
 SHA1 (patch-src_libreplace_Makefile.in) = 12fab6f97efff6cc1944ebb5a5cf26fdb79971c2
 SHA1 (patch-src_libreplace_ensure__libreplace__symbol.c) = 1b2ccf11fe7cade3c7769e7388cdd79ee250b26e
 SHA1 (patch-src_libspf2_spf__dns__resolv.c) = b704c82f6627154470b07763d2233923bf0f6b10

Index: pkgsrc/mail/libspf2/patches/patch-src_include_spf__log.h
diff -u pkgsrc/mail/libspf2/patches/patch-src_include_spf__log.h:1.1 pkgsrc/mail/libspf2/patches/patch-src_include_spf__log.h:1.2
--- pkgsrc/mail/libspf2/patches/patch-src_include_spf__log.h:1.1        Sat Dec 22 02:25:57 2012
+++ pkgsrc/mail/libspf2/patches/patch-src_include_spf__log.h    Sat Apr  2 21:41:39 2022
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_include_spf__log.h,v 1.1 2012/12/22 02:25:57 joerg Exp $
+$NetBSD: patch-src_include_spf__log.h,v 1.2 2022/04/02 21:41:39 spz Exp $
 
 Dropping a trailing comma when __VA_ARGS__ would be empty is a GCC extension.
 
---- src/include/spf_log.h.orig 2012-12-21 21:29:20.000000000 +0000
+--- src/include/spf_log.h.orig 2021-06-09 05:43:12.000000000 +0000
 +++ src/include/spf_log.h
 @@ -60,10 +60,10 @@ void SPF_debugv( const char *file, int l
  
  #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
  
--#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, ##__VA_ARGS__ )
+-#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, ##__VA_ARGS__ )
+-#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, ##__VA_ARGS__ )
+-#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, ##__VA_ARGS__ )
 +#define SPF_errorf(...) SPF_errorx( __FILE__, __LINE__, __VA_ARGS__ )
 +#define SPF_warningf(...) SPF_warningx( __FILE__, __LINE__, __VA_ARGS__ )
 +#define SPF_infof(...) SPF_infox( __FILE__, __LINE__, __VA_ARGS__ )