Update "libspf2" package to version 1.2.10. A list of changes since

version 1.2.9 (which is old) is not available. Two improvements that
I noticed are:
1.) A remote DoS vulnerability (for which "pkgsrc" had a patch) has
    been fixed.
2.) The SPF records for "gmail.com" are now accepted again.

5 files changed, 33 insertions, 51 deletions

diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 3f91dc10b94..74c9158be55 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2013/03/04 17:31:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2013/07/06 11:09:26 tron Exp $
 
-DISTNAME=	libspf2-1.2.9
-PKGREVISION=	2
+DISTNAME=	libspf2-1.2.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf2.org/spf/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.libspf2.org/
 COMMENT=	Implementation of the Sender Policy Framework
+LICENSE=	modified-bsd OR gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
diff --git a/mail/libspf2/distinfo b/mail/libspf2/distinfo
index 603936fcded..091163e8370 100644
--- a/mail/libspf2/distinfo
+++ b/mail/libspf2/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2013/03/04 17:31:55 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2013/07/06 11:09:26 tron Exp $
 
-SHA1 (libspf2-1.2.9.tar.gz) = 15dfe3b9172180654f4de4dd85f3f01e3bc11503
-RMD160 (libspf2-1.2.9.tar.gz) = d0754d47e297a00038e4185e17704a24d38a4888
-Size (libspf2-1.2.9.tar.gz) = 518001 bytes
-SHA1 (patch-aa) = 81f60333222b510cb511b80aedbb679d2212ab0d
-SHA1 (patch-configure) = 27cf3752d9e90cf957e477deace11ec5fe50648d
+SHA1 (libspf2-1.2.10.tar.gz) = 3c31b20c737d9a8044440e5bf25697016b9cb582
+RMD160 (libspf2-1.2.10.tar.gz) = 5557435802896bec31362c1fa028e9e295656455
+Size (libspf2-1.2.10.tar.gz) = 508842 bytes
+SHA1 (patch-configure) = 4457ad150c192031f5db020cfd10110f7e4f28b1
 SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed
-SHA1 (patch-src_libreplace_Makefile.in) = 404bc029100df4e43c3dacfd3016b2f521453b69
+SHA1 (patch-src_libreplace_Makefile.in) = 12fab6f97efff6cc1944ebb5a5cf26fdb79971c2
 SHA1 (patch-src_libreplace_ensure__libreplace__symbol.c) = 1b2ccf11fe7cade3c7769e7388cdd79ee250b26e
diff --git a/mail/libspf2/patches/patch-aa b/mail/libspf2/patches/patch-aa
deleted file mode 100644
index 9041c339cc4..00000000000
--- a/mail/libspf2/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/09/08 10:36:27 tron Exp $
-
-Fix an abort() caused by miscalculating the size of an internal buffer.
-This can crash applications using "libspf2" (e.g. "milter-greylist")
-in an e-mail gets delivered via SMTP over IPv6 depending on the
-remote machine's IPv6 address.
-
---- src/libspf2/spf_expand.c.orig	2008-11-03 21:29:00.000000000 +0000
-+++ src/libspf2/spf_expand.c	2009-09-08 11:27:52.000000000 +0100
-@@ -245,7 +245,7 @@
- 		case PARM_CLIENT_IP:		/* SMTP client IP				*/
- #ifdef COMPUTE
- 			if (compute_length) {
--				len = sizeof(ip6_buf);
-+				len = sizeof(ip6_rbuf);
- 				if (d->dv.url_encode)
- 					len *= 3;
- 				buflen += len;
diff --git a/mail/libspf2/patches/patch-configure b/mail/libspf2/patches/patch-configure
index ee7d0c8ec59..ef13df1d9e2 100644
--- a/mail/libspf2/patches/patch-configure
+++ b/mail/libspf2/patches/patch-configure
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.2 2013/03/04 17:31:56 jperkin Exp $
+$NetBSD: patch-configure,v 1.3 2013/07/06 11:09:26 tron Exp $
 
 Ensure that libreplace contains at least one symbol.
 
---- configure.orig	2008-11-04 15:32:56.000000000 +0000
-+++ configure
-@@ -25648,7 +25648,7 @@ done
+--- configure.orig	2012-02-20 07:31:46.000000000 +0000
++++ configure	2013-07-06 11:54:48.000000000 +0100
+@@ -13577,7 +13577,7 @@
+ fi
+ done
  
- 
- 
--for ac_func in getopt_long_only strncasecmp
-+for ac_func in ensure_libreplace_symbol getopt_long_only strncasecmp
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
+-for ac_func in strcasecmp strncasecmp strspn strtoul
++for ac_func in ensure_libreplace_symbol strcasecmp strncasecmp strspn strtoul
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/mail/libspf2/patches/patch-src_libreplace_Makefile.in b/mail/libspf2/patches/patch-src_libreplace_Makefile.in
index 3cf9cb37637..d32abb4c039 100644
--- a/mail/libspf2/patches/patch-src_libreplace_Makefile.in
+++ b/mail/libspf2/patches/patch-src_libreplace_Makefile.in
@@ -1,18 +1,19 @@
-$NetBSD: patch-src_libreplace_Makefile.in,v 1.1 2013/03/04 17:31:56 jperkin Exp $
+$NetBSD: patch-src_libreplace_Makefile.in,v 1.2 2013/07/06 11:09:26 tron Exp $
 
 Ensure libreplace contains at least one symbol.
 
---- src/libreplace/Makefile.in.orig	2008-11-04 15:33:01.000000000 +0000
-+++ src/libreplace/Makefile.in
-@@ -60,6 +60,7 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@	$(DEPDIR)/__ns_initparse.Plo \
- @AMDEP_TRUE@	$(DEPDIR)/__ns_msg_getflag.Plo \
- @AMDEP_TRUE@	$(DEPDIR)/__ns_name_uncompress.Plo \
-+@AMDEP_TRUE@	$(DEPDIR)/ensure_libreplace_symbol.Plo \
- @AMDEP_TRUE@	$(DEPDIR)/getopt_long_only.Plo \
- @AMDEP_TRUE@	$(DEPDIR)/malloc.Plo $(DEPDIR)/memcmp.Plo \
- @AMDEP_TRUE@	$(DEPDIR)/realloc.Plo $(DEPDIR)/strncasecmp.Plo
-@@ -255,6 +256,7 @@ distclean-compile:
+--- src/libreplace/Makefile.in.orig	2012-02-20 07:31:47.000000000 +0000
++++ src/libreplace/Makefile.in	2013-07-06 11:57:16.000000000 +0100
+@@ -38,7 +38,7 @@
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	__ns_get16.c __ns_initparse.c __ns_msg_getflag.c \
+ 	__ns_name_uncompress.c getopt_long_only.c malloc.c memcmp.c \
+-	realloc.c strncasecmp.c
++	realloc.c strncasecmp.c ensure_libreplace_symbol.c
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -290,6 +290,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__ns_initparse.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__ns_msg_getflag.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__ns_name_uncompress.Plo@am__quote@