aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authortobik <tobik@FreeBSD.org>2018-11-08 19:55:58 +0800
committertobik <tobik@FreeBSD.org>2018-11-08 19:55:58 +0800
commita960b32b17490dd107019aab61abfaef5ab0f90e (patch)
treefeb606e5cb583199b2e7ea5d31a827df4a6ef1d1 /mail
parentea94ef33d994f2bf9a58aaca2ac4fac8a1761eb9 (diff)
downloadfreebsd-ports-gnome-a960b32b17490dd107019aab61abfaef5ab0f90e.tar.gz
freebsd-ports-gnome-a960b32b17490dd107019aab61abfaef5ab0f90e.tar.zst
freebsd-ports-gnome-a960b32b17490dd107019aab61abfaef5ab0f90e.zip
mail/rss2email2: Add workaround for filtering out bad tags
This can apparently be triggered with malformed RSS feeds. Traceback (most recent call last): File "/usr/share/rss2email/rss2email.py", line 711, in run tagline = ",".join(taglist) TypeError: sequence item 1: expected string or Unicode, NoneType found https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734327 - Reset maintainer due to the long timeout PR: 214934 Submitted by: jonathan@invertedearth.net Approved by: srg@guglielmo.us (maintainer timeout, ~2 years)
Diffstat (limited to 'mail')
-rw-r--r--mail/rss2email2/Makefile4
-rw-r--r--mail/rss2email2/files/patch-rss2email.py13
2 files changed, 15 insertions, 2 deletions
diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile
index 6297a503ace3..7b9e2d16297e 100644
--- a/mail/rss2email2/Makefile
+++ b/mail/rss2email2/Makefile
@@ -3,12 +3,12 @@
PORTNAME= rss2email
PORTVERSION= 2.71
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail python
MASTER_SITES= http://www.allthingsrss.com/rss2email/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= srg@guglielmo.us
+MAINTAINER= ports@FreeBSD.org
COMMENT= Emails posts from subscribed RSS/Atom newsfeeds
LICENSE= GPLv2 GPLv3
diff --git a/mail/rss2email2/files/patch-rss2email.py b/mail/rss2email2/files/patch-rss2email.py
new file mode 100644
index 000000000000..0afdc3d5a9dd
--- /dev/null
+++ b/mail/rss2email2/files/patch-rss2email.py
@@ -0,0 +1,13 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734327
+
+--- rss2email.py.orig 2018-01-14 00:42:27 UTC
++++ rss2email.py
+@@ -694,7 +694,7 @@ def run(num=None):
+ for tag in tags:
+ taglist.append(tag['term'])
+ if taglist:
+- tagline = ",".join(taglist)
++ tagline = ",".join(filter(None, taglist))
+
+ extraheaders = {'Date': datehdr, 'User-Agent': useragenthdr, 'X-RSS-Feed': f.url, 'X-RSS-ID': id, 'X-RSS-URL': link, 'X-RSS-TAGS' : tagline}
+ if BONUS_HEADER != '':