From owner-svn-ports-branches@freebsd.org Thu Nov 8 13:51:19 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86487112B0B3; Thu, 8 Nov 2018 13:51:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0C11A7F4DD; Thu, 8 Nov 2018 13:51:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE65025612; Thu, 8 Nov 2018 13:51:18 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8DpI5s040634; Thu, 8 Nov 2018 13:51:18 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8DpIqq040630; Thu, 8 Nov 2018 13:51:18 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811081351.wA8DpIqq040630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 8 Nov 2018 13:51:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484456 - in branches/2018Q4/mail/rss2email2: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2018Q4/mail/rss2email2: . files X-SVN-Commit-Revision: 484456 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0C11A7F4DD X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2018 13:51:19 -0000 Author: tobik Date: Thu Nov 8 13:51:18 2018 New Revision: 484456 URL: https://svnweb.freebsd.org/changeset/ports/484456 Log: MFH: r484444 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) Approved by: ports-secteam runtime fix blanket Added: branches/2018Q4/mail/rss2email2/files/patch-rss2email.py - copied unchanged from r484444, head/mail/rss2email2/files/patch-rss2email.py Modified: branches/2018Q4/mail/rss2email2/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/rss2email2/Makefile ============================================================================== --- branches/2018Q4/mail/rss2email2/Makefile Thu Nov 8 13:50:21 2018 (r484455) +++ branches/2018Q4/mail/rss2email2/Makefile Thu Nov 8 13:51:18 2018 (r484456) @@ -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 Copied: branches/2018Q4/mail/rss2email2/files/patch-rss2email.py (from r484444, head/mail/rss2email2/files/patch-rss2email.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/rss2email2/files/patch-rss2email.py Thu Nov 8 13:51:18 2018 (r484456, copy of r484444, head/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 != '':