Update to 2.70. From the changelog: 2.70 (2010-12-21) * Improved handling of given feed email addresses to prevent mail servers rejecting poorly formed Froms * Added X-RSS-TAGS header that lists any tags provided by an entry, which will be helpful in filtering incoming messages 2.69 (2010-11-12) * Added support for connecting to SMTP server via SSL, see SMTP_SSL option * Improved backwards compatibility by fixing issue with listing feeds when run with older Python versions * Added selective feed email overrides through OVERRIDE_EMAIL and DEFAULT_EMAIL options * Added NO_FRIENDLY_NAME to from from address only without the friendly name * Added X-RSS-URL header in each message with the link to the original item 2.68 (2010-10-01) * Added ability to pause/resume checking of individual feeds through pause and unpause commands * Added ability to import and export OPML feed lists through importopml and exportopml commands 2.67 (2010-09-21) * Fixed entries that include an id which is blank (i.e., an empty string) were being resent * Fixed some entries not being sent by email because they had bad From headers * Fixed From headers with HTML entities encoded twice * Compatibility changes to support most recent development versions of feedparser * Compatibility changes to support Google Reader feeds 2.66 (2009-12-21) * Complete packaging of all necessary source files (rss2email, html2text, feedparser, r2e, etc.) into one bundle * Included a more complete config.py with all options * Default to HTML mail and CSS results * Added 'reset' command to erase history of already seen entries * Changed project email and homepage * Made exception and error output text more useful * Added X-RSS-Feed and X-RSS-ID headers to each email for easier filtering * Improved enclosure handling * Fixed MacOS compatibility issuesdiff -r1.24 -r1.25 pkgsrc/mail/rss2email/Makefile
(schmonz)
@@ -1,51 +1,49 @@ | @@ -1,51 +1,49 @@ | |||
1 | # $NetBSD: Makefile,v 1.24 2010/02/10 19:17:41 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.25 2011/01/28 01:41:52 schmonz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= rss2email-2.65 | 4 | DISTNAME= rss2email-2.70 | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= mail | 5 | CATEGORIES= mail | |
7 | MASTER_SITES= ${HOMEPAGE} | 6 | MASTER_SITES= ${HOMEPAGE} | |
8 | EXTRACT_SUFX= .py | |||
9 | 7 | |||
10 | MAINTAINER= schmonz@NetBSD.org | 8 | MAINTAINER= schmonz@NetBSD.org | |
11 | HOMEPAGE= http://rss2email.infogami.com/ | 9 | HOMEPAGE= http://www.allthingsrss.com/rss2email/ | |
12 | COMMENT= Get RSS feeds emailed to you | 10 | COMMENT= Get RSS feeds emailed to you | |
13 | 11 | |||
14 | DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser | 12 | DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser | |
15 | DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text | 13 | DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text | |
16 | 14 | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | 16 | |||
19 | WRKSRC= ${WRKDIR} | |||
20 | ||||
21 | USE_TOOLS+= tr | |||
22 | NO_BUILD= yes | 17 | NO_BUILD= yes | |
23 | PYTHON_PATCH_SCRIPTS= *.py | 18 | PYTHON_PATCH_SCRIPTS= *.py | |
24 | 19 | |||
25 | SUBST_CLASSES+= bin | 20 | SUBST_CLASSES+= bin | |
26 | SUBST_STAGE.bin= do-configure | 21 | SUBST_STAGE.bin= do-configure | |
27 | SUBST_FILES.bin= rss2email.py r2e | 22 | SUBST_FILES.bin= rss2email.py r2e | |
28 | SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g' | 23 | SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g' | |
29 | SUBST_SED.bin+= -e 's|@PREFIX@|${PREFIX}|g' | 24 | SUBST_SED.bin+= -e 's|@PREFIX@|${PREFIX}|g' | |
30 | SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' | 25 | SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' | |
31 | 26 | |||
27 | SUBST_CLASSES+= crlf | |||
28 | SUBST_STAGE.crlf= post-extract | |||
29 | SUBST_FILES.crlf= config.py.example | |||
30 | SUBST_SED.crlf= -e 's| ||g' | |||
31 | ||||
32 | SHAREDIR= ${PREFIX}/share/rss2email | 32 | SHAREDIR= ${PREFIX}/share/rss2email | |
33 | EGDIR= ${PREFIX}/share/examples/rss2email | 33 | EGDIR= ${PREFIX}/share/examples/rss2email | |
34 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 | 34 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 | |
35 | 35 | |||
36 | do-extract: | 36 | post-extract: | |
37 | tr -d '\r' < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \ | 37 | cp ${FILESDIR}/r2e.1 ${WRKSRC} | |
38 | > ${WRKSRC}/rss2email.py | |||
39 | cd ${FILESDIR} && cp config.py r2e r2e.1 ${WRKSRC} | |||
40 | 38 | |||
41 | do-install: | 39 | do-install: | |
42 | set -e; cd ${WRKSRC}; \ | 40 | set -e; cd ${WRKSRC}; \ | |
43 | ${INSTALL_SCRIPT_DIR} ${DESTDIR}${SHAREDIR}; \ | 41 | ${INSTALL_SCRIPT_DIR} ${DESTDIR}${SHAREDIR}; \ | |
44 | ${INSTALL_SCRIPT} rss2email.py ${DESTDIR}${SHAREDIR}; \ | 42 | ${INSTALL_SCRIPT} rss2email.py ${DESTDIR}${SHAREDIR}; \ | |
45 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}; \ | 43 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}; \ | |
46 | ${INSTALL_DATA} config.py ${DESTDIR}${EGDIR}; \ | 44 | ${INSTALL_DATA} config.py.example ${DESTDIR}${EGDIR}/config.py; \ | |
47 | ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ | 45 | ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ | |
48 | ${INSTALL_SCRIPT} r2e ${DESTDIR}${PREFIX}/bin | 46 | ${INSTALL_SCRIPT} r2e ${DESTDIR}${PREFIX}/bin | |
49 | 47 | |||
50 | .include "../../lang/python/application.mk" | 48 | .include "../../lang/python/application.mk" | |
51 | .include "../../mk/bsd.pkg.mk" | 49 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,8 @@ | @@ -1,6 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.17 2009/04/07 04:41:18 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.18 2011/01/28 01:41:52 schmonz Exp $ | |
2 | 2 | |||
3 | SHA1 (rss2email-2.65.py) = 8fe6c6c1bfe56164fba64378fc1f0b8295b1b8d9 | 3 | SHA1 (rss2email-2.70.tar.gz) = 8f59e33e38b0a01a9ce411b82b31708604228c37 | |
4 | RMD160 (rss2email-2.65.py) = fcc0df8e47d81c495f7c7aa045672bc0eaf898ab | 4 | RMD160 (rss2email-2.70.tar.gz) = d5d7a06c33d51c21784c069c27fb52ab87665b06 | |
5 | Size (rss2email-2.65.py) = 25874 bytes | 5 | Size (rss2email-2.70.tar.gz) = 57961 bytes | |
6 | SHA1 (patch-ad) = 6b3c7908eadbebca34cde9431d1d85b3761f5aad | 6 | SHA1 (patch-aa) = a19bb5795e7fcbfc8e03f86c25646b091052794b | |
7 | SHA1 (patch-ab) = db8f4780a40f1231782e7391c7d7b03c011a8534 | |||
8 | SHA1 (patch-ad) = d76be79ebd5886d75f885fe96d0d9d8b1720c243 |
$NetBSD: patch-aa,v 1.4 2011/01/28 01:41:53 schmonz Exp $
--- config.py.example.orig 2011-01-28 01:22:26.000000000 +0000
+++ config.py.example
@@ -92,3 +92,14 @@ PROXY=""
# To most correctly encode emails with international characters, we iterate through the list below and use the first character set that works
# Eventually (and theoretically) ISO-8859-1 and UTF-8 are our catch-all failsafes
CHARSET_LIST='US-ASCII', 'BIG5', 'ISO-2022-JP', 'ISO-8859-1', 'UTF-8'
+
+## html2text options ##
+
+# Use Unicode characters instead of their ascii psuedo-replacements
+UNICODE_SNOB = 0
+
+# Put the links after each paragraph instead of at the end.
+LINKS_EACH_PARAGRAPH = 0
+
+# Wrap long lines at position. 0 for no wrapping. (Requires Python 2.3.)
+BODY_WIDTH = 0
$NetBSD: patch-ab,v 1.4 2011/01/28 01:41:53 schmonz Exp $
--- r2e.orig 2006-03-16 23:43:03.000000000 +0000
+++ r2e
@@ -1,2 +1,7 @@
#!/bin/sh
-python rss2email.py feeds.dat $*
+set -e
+if [ ! -d ~/.rss2email ]; then
+ mkdir ~/.rss2email
+fi
+cd ~/.rss2email
+exec @PYTHONBIN@ @PREFIX@/share/rss2email/rss2email.py feeds.dat $*
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: patch-ad,v 1.6 2009/04/07 04:41:19 schmonz Exp $ | 1 | $NetBSD: patch-ad,v 1.7 2011/01/28 01:41:53 schmonz Exp $ | |
2 | 2 | |||
3 | --- rss2email.py.orig 2009-04-05 13:43:25.000000000 -0400 | 3 | --- rss2email.py.orig 2010-12-17 18:29:34.000000000 +0000 | |
4 | +++ rss2email.py | 4 | +++ rss2email.py | |
5 | @@ -270,6 +270,7 @@ for e in ['error', 'gaierror']: | 5 | @@ -296,6 +296,7 @@ for e in ['error', 'gaierror']: | |
6 | import feedparser | 6 | import feedparser | |
7 | feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.aaronsw.com/2002/rss2email/" | 7 | feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.allthingsrss.com/rss2email/" | |
8 | 8 | |||
9 | +sys.path.append("@LOCALBASE@/share/html2text") | 9 | +sys.path.append("@LOCALBASE@/share/html2text") | |
10 | import html2text as h2t | 10 | import html2text as h2t | |
11 | 11 | |||
12 | h2t.UNICODE_SNOB = UNICODE_SNOB | 12 | h2t.UNICODE_SNOB = UNICODE_SNOB |