Hi ports --

Attached is an update to py-feedparser bringing it up to its latest version. Feedparser is now required for www/rawdog (update patch for that to be sent shortly).

Some tweaks: change the V variable to MODPY_EGG_VERSION because that is convention, and to reduce future PLIST churn. Also, the feedparser.org homepage appears to be gone so change HOMEPAGE to its googlecode page.

Works for me on amd64.

OK? (MAINTAINER timeout)

~Brian

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-feedparser/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile    7 Aug 2013 21:32:42 -0000       1.15
+++ Makefile    9 Aug 2013 01:00:34 -0000
@@ -2,13 +2,12 @@
 
 COMMENT=       RSS and Atom feeds parser written in Python
 
-V=             5.0.1
-DISTNAME=      feedparser-${V}
+MODPY_EGG_VERSION=     5.1.3
+DISTNAME=      feedparser-${MODPY_EGG_VERSION}
 PKGNAME=       py-${DISTNAME}
-REVISION=      2
 CATEGORIES=    textproc
 
-HOMEPAGE=      http://www.feedparser.org/
+HOMEPAGE=      https://code.google.com/p/feedparser/
 
 MAINTAINER=    Romain Gaillegue <rom...@biscotte.net>
 
@@ -18,6 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes
 MASTER_SITES=  https://feedparser.googlecode.com/files/
 
 MODULES=       lang/python
+MODPY_SETUP_TOOLS=     Yes
 
 do-test:
        cd ${WRKSRC}/feedparser/ && ${MODPY_BIN} feedparsertest.py
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-feedparser/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo    18 Mar 2011 12:17:50 -0000      1.7
+++ distinfo    9 Aug 2013 01:00:34 -0000
@@ -1,5 +1,2 @@
-MD5 (feedparser-5.0.1.tar.gz) = Df1K1uEFm6jfO27rxg7vWQ==
-RMD160 (feedparser-5.0.1.tar.gz) = 5dTqffPk7GfDsv+9h5j7V6Hfpz0=
-SHA1 (feedparser-5.0.1.tar.gz) = EWMdQcl4K5Kv1TO4o6o+oM6qHvE=
-SHA256 (feedparser-5.0.1.tar.gz) = kyICWKZhryQaVpUXH98JtMs5I04u24vA2O9uUXNQECc=
-SIZE (feedparser-5.0.1.tar.gz) = 313356
+SHA256 (feedparser-5.1.3.tar.gz) = rVQ2OeidQ2heLx07bkhxFWLuw743nmlYqSD76vTGO84=
+SIZE (feedparser-5.1.3.tar.gz) = 283614
Index: patches/patch-feedparser_feedparser_py
===================================================================
RCS file: patches/patch-feedparser_feedparser_py
diff -N patches/patch-feedparser_feedparser_py
--- patches/patch-feedparser_feedparser_py      25 May 2012 12:27:33 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-feedparser_feedparser_py,v 1.1 2012/05/25 12:27:33 jasper Exp $
-
-Security fix for CVE-2012-2921,
-feedparser DOCTYPE and ENTITY XML Declaration Denial of Service Vulnerability
-
-Patch from upstream:
-https://code.google.com/p/feedparser/source/detail?r=703&path=/trunk/feedparser/feedparser.py
-
---- feedparser/feedparser.py.orig      Fri May 25 14:24:41 2012
-+++ feedparser/feedparser.py   Fri May 25 14:25:48 2012
-@@ -3703,9 +3703,6 @@ def parse(url_file_stream_or_string, etag=None, modifi
-         result['bozo'] = 1
-         result['bozo_exception'] = NonXMLContentType(bozo_message)
- 
--    if data is not None:
--        result['version'], data, entities = _stripDoctype(data)
--
-     # ensure that baseuri is an absolute uri using an acceptable URI scheme
-     contentloc = http_headers.get('content-location', 
http_headers.get('Content-Location', ''))
-     href = result.get('href', '')
-@@ -3790,6 +3787,9 @@ def parse(url_file_stream_or_string, etag=None, modifi
-             'document declared as %s, but parsed as %s' % \
-             (result['encoding'], proposed_encoding))
-         result['encoding'] = proposed_encoding
-+
-+    if data is not None:
-+        result['version'], data, entities = _stripDoctype(data)
- 
-     if not _XML_AVAILABLE:
-         use_strict_parser = 0
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-feedparser/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   16 Mar 2011 22:52:10 -0000      1.3
+++ pkg/PLIST   9 Aug 2013 01:00:34 -0000
@@ -1,5 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.3 2011/03/16 22:52:10 jasper Exp $
-lib/python${MODPY_VERSION}/site-packages/feedparser-5.0.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/feedparser-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/feedparser.py
 lib/python${MODPY_VERSION}/site-packages/feedparser.pyc
-share/doc/py-feedparser/

Reply via email to