diff options
| author | schmonz <schmonz@pkgsrc.org> | 2011-06-09 06:21:58 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2011-06-09 06:21:58 +0000 |
| commit | 04ae3a506c42442e8130adee9c5ed68d169f84ef (patch) | |
| tree | 8be8867892a929bcf9b9a224ff631c4c0dd551bc /mail/rss2email/patches | |
| parent | 5c5b90a877e67005919eb32082f0359c051e6739 (diff) | |
| download | pkgsrc-04ae3a506c42442e8130adee9c5ed68d169f84ef.tar.gz | |
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
Diffstat (limited to 'mail/rss2email/patches')
| -rw-r--r-- | mail/rss2email/patches/patch-aa | 4 | ||||
| -rw-r--r-- | mail/rss2email/patches/patch-ab | 4 | ||||
| -rw-r--r-- | mail/rss2email/patches/patch-ad | 24 |
3 files changed, 10 insertions, 22 deletions
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 - |