5 files changed, 6 insertions, 57 deletions

diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 5130052d1754..e12e6164d704 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libspf2
-PORTVERSION=	1.2.9
-PORTREVISION=	2
+PORTVERSION=	1.2.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf2.org/spf/ \
 		LOCAL/sunpoet
@@ -11,6 +10,9 @@ MASTER_SITES=	http://www.libspf2.org/spf/ \
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sender Rewriting Scheme 2 C Implementation
 
+LICENSE=	BSD LGPL21 LGPL3
+LICENSE_COMB=	dual
+
 CONFLICTS=	${PORTNAME}-1.0.* p5-Mail-SPF-[0-9]* p5-Mail-SPF-Query-[0-9]*
 
 GNU_CONFIGURE=	yes
diff --git a/mail/libspf2/distinfo b/mail/libspf2/distinfo
index 80d3fec1c72d..224fb9be2834 100644
--- a/mail/libspf2/distinfo
+++ b/mail/libspf2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libspf2-1.2.9.tar.gz) = 4837f6b063b1431673754cbf6bef8979de5ffc4d7f26f6b93abd42787ba04862
-SIZE (libspf2-1.2.9.tar.gz) = 518001
+SHA256 (libspf2-1.2.10.tar.gz) = d91e3de81ae287a2976c44f60283bd3000d720e6a112dc7142eedf1831b821c9
+SIZE (libspf2-1.2.10.tar.gz) = 508842
diff --git a/mail/libspf2/files/patch-src_libspf2_spf__compile.c b/mail/libspf2/files/patch-src_libspf2_spf__compile.c
deleted file mode 100644
index dd5b6384336c..000000000000
--- a/mail/libspf2/files/patch-src_libspf2_spf__compile.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libspf2/spf_compile.c	2008-11-03 15:37:33.000000000 -0500
-+++ src/libspf2/spf_compile.c	2009-09-07 23:46:02.000000000 -0400
-@@ -778,7 +778,7 @@
- 	const char			*end;
- 	const char			*p;
- 
--	char				 buf[ INET_ADDRSTRLEN ];
-+	char				 buf[ INET6_ADDRSTRLEN ];
- 	size_t				 len;
- 	int					 err;
- 
diff --git a/mail/libspf2/files/patch-src_libspf2_spf__expand.c b/mail/libspf2/files/patch-src_libspf2_spf__expand.c
deleted file mode 100644
index 1f78ba131766..000000000000
--- a/mail/libspf2/files/patch-src_libspf2_spf__expand.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/libspf2/spf_expand.c
-diff -u -p src/libspf2/spf_expand.c.orig src/libspf2/spf_expand.c
---- src/libspf2/spf_expand.c.orig	2008-11-04 06:29:00.000000000 +0900
-+++ src/libspf2/spf_expand.c	2009-11-02 01:50:13.008764120 +0900
-@@ -245,7 +245,7 @@ top:
- 		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/files/patch-src_libspf2_spf__interpret.c b/mail/libspf2/files/patch-src_libspf2_spf__interpret.c
deleted file mode 100644
index 2dbc39b54362..000000000000
--- a/mail/libspf2/files/patch-src_libspf2_spf__interpret.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/libspf2/spf_interpret.c	2008-10-22 11:47:43.000000000 -0400
-+++ src/libspf2/spf_interpret.c	2009-09-08 00:42:25.000000000 -0400
-@@ -505,7 +505,7 @@
- 	char		dst_ip6_buf[ INET6_ADDRSTRLEN ];
- 
- 	struct in6_addr		src_ipv6;
--	int				cidr, mask;
-+	int				cidr, cidr_save, mask;
- 	int				i;
- 	int				match;
- 
-@@ -517,6 +517,7 @@
- 	cidr = SPF_i_mech_cidr(spf_request, mech);
- 	if ( cidr == 0 )
- 		cidr = 128;
-+	cidr_save = cidr;
- 
- 	match = TRUE;
- 	for( i = 0; i < array_elem( ipv6.s6_addr ) && match; i++ )
-@@ -538,7 +539,7 @@
- 		INET_NTOP(AF_INET6, &ipv6.s6_addr,
- 							dst_ip6_buf, sizeof(dst_ip6_buf));
- 		SPF_debugf( "ip_match:  %s == %s  (/%d):  %d",
--				src_ip6_buf, dst_ip6_buf, cidr, match );
-+				src_ip6_buf, dst_ip6_buf, cidr_save, match );
- 	}
- 
- 	return match;
-