Update to 2.71. From the changelog:

* Potentially safer method for writing feeds.dat on UNIX
* Handle via links with no title attribute
* Handle attributes more cleanly with OVERRIDE_EMAIL and DEFAULT_EMAIL

5 files changed, 21 insertions, 32 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 2360dc2c98b..d613126cdd0 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.26 2011/02/12 14:11:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2011/06/09 06:21:58 schmonz Exp $
 #
 
-DISTNAME=		rss2email-2.70
-PKGREVISION=		1
+DISTNAME=		rss2email-2.71
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
+EXTRACT_SUFX=		.zip
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.allthingsrss.com/rss2email/
 COMMENT=		Get RSS feeds emailed to you
+LICENSE=		gnu-gpl-v2
 
 DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
 DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index 1f64e027057..8ae39a33726 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2011/02/12 14:11:42 schmonz Exp $
+$NetBSD: distinfo,v 1.20 2011/06/09 06:21:58 schmonz Exp $
 
-SHA1 (rss2email-2.70.tar.gz) = 8f59e33e38b0a01a9ce411b82b31708604228c37
-RMD160 (rss2email-2.70.tar.gz) = d5d7a06c33d51c21784c069c27fb52ab87665b06
-Size (rss2email-2.70.tar.gz) = 57961 bytes
-SHA1 (patch-aa) = a19bb5795e7fcbfc8e03f86c25646b091052794b
-SHA1 (patch-ab) = db8f4780a40f1231782e7391c7d7b03c011a8534
-SHA1 (patch-ad) = c50bde2a97ac5787aa4d9dd78964bbb647c919c9
+SHA1 (rss2email-2.71.zip) = aa0123a02139415acdcb765bdcafe4c568d5c16b
+RMD160 (rss2email-2.71.zip) = 2c2e81b6d4e2101ca7e82d524b6222aa44056e95
+Size (rss2email-2.71.zip) = 63612 bytes
+SHA1 (patch-aa) = 5c35ae987257ed8fbe2efae11f144e37b1236d45
+SHA1 (patch-ab) = a53ac7577f897750d51f0db17be5b28480278097
+SHA1 (patch-ad) = 2dd7fe698eae415085fe62f3df16337cc95481c3
diff --git a/mail/rss2email/patches/patch-aa b/mail/rss2email/patches/patch-aa
index b1c01de9783..3a1db9a98da 100644
--- a/mail/rss2email/patches/patch-aa
+++ b/mail/rss2email/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2011/01/28 01:41:53 schmonz Exp $
+$NetBSD: patch-aa,v 1.5 2011/06/09 06:21:58 schmonz Exp $
+
+Missing sample config entries from the Debian package.
 
 --- config.py.example.orig	2011-01-28 01:22:26.000000000 +0000
 +++ config.py.example
diff --git a/mail/rss2email/patches/patch-ab b/mail/rss2email/patches/patch-ab
index 7d02fe6d26c..116033c32ad 100644
--- a/mail/rss2email/patches/patch-ab
+++ b/mail/rss2email/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2011/01/28 01:41:53 schmonz Exp $
+$NetBSD: patch-ab,v 1.5 2011/06/09 06:21:58 schmonz Exp $
+
+Fixes from the Debian package.
 
 --- r2e.orig	2006-03-16 23:43:03.000000000 +0000
 +++ r2e
diff --git a/mail/rss2email/patches/patch-ad b/mail/rss2email/patches/patch-ad
index cb033884a40..1b266bd72b9 100644
--- a/mail/rss2email/patches/patch-ad
+++ b/mail/rss2email/patches/patch-ad
@@ -1,6 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2011/02/12 14:11:42 schmonz Exp $
+$NetBSD: patch-ad,v 1.9 2011/06/09 06:21:58 schmonz Exp $
 
---- rss2email.py.orig	2010-12-17 18:29:34.000000000 +0000
+Find the pkgsrc-provided py-html2text.
+
+--- rss2email.py.orig	2011-03-04 13:51:24.000000000 +0000
 +++ rss2email.py
 @@ -296,6 +296,7 @@ for e in ['error', 'gaierror']:
  import feedparser
@@ -10,21 +12,3 @@ $NetBSD: patch-ad,v 1.8 2011/02/12 14:11:42 schmonz Exp $
  import html2text as h2t
  
  h2t.UNICODE_SNOB = UNICODE_SNOB
-@@ -446,7 +447,7 @@ def getEmail(r, entry):
- 		
- 	if FORCE_FROM: return DEFAULT_FROM
- 	
--	if r.url in OVERRIDE_EMAIL.keys():
-+	if hasattr(r, "url") and r.url in OVERRIDE_EMAIL.keys():
- 		return validateEmail(OVERRIDE_EMAIL[r.url], DEFAULT_FROM)
- 	
- 	if 'email' in entry.get('author_detail', []):
-@@ -462,7 +463,7 @@ def getEmail(r, entry):
- 		if feed.get("errorreportsto", ''):
- 			return validateEmail(feed.errorreportsto, DEFAULT_FROM)
- 			
--	if r.url in DEFAULT_EMAIL.keys():
-+	if hasattr(r, "url") and r.url in DEFAULT_EMAIL.keys():
- 		return DEFAULT_EMAIL[r.url]
- 	return DEFAULT_FROM
-