Date: Tue, 26 Dec 2017 18:33:18 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457300 - in head: . www www/py-flup www/py-flup6 www/py-flup6/files Message-ID: <201712261833.vBQIXIPX028184@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Tue Dec 26 18:33:18 2017 New Revision: 457300 URL: https://svnweb.freebsd.org/changeset/ports/457300 Log: - Change to flup6, a fork supports py3k - Pass maintainership to submitter PR: 224332 Submitted by: Shane <FreeBSD@ShaneWare.Biz> Added: head/www/py-flup6/ - copied from r457299, head/www/py-flup/ head/www/py-flup6/files/ head/www/py-flup6/files/patch-flup_server_ajp__base.py (contents, props changed) head/www/py-flup6/files/patch-flup_server_fcgi__base.py (contents, props changed) head/www/py-flup6/files/patch-flup_server_scgi__base.py (contents, props changed) Deleted: head/www/py-flup/ Modified: head/MOVED head/www/Makefile head/www/py-flup6/Makefile head/www/py-flup6/distinfo head/www/py-flup6/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Tue Dec 26 18:26:08 2017 (r457299) +++ head/MOVED Tue Dec 26 18:33:18 2017 (r457300) @@ -9824,3 +9824,4 @@ math/petsc-mpich|science/PETSc|2017-12-20|Recreated af textproc/py-elasticsearch-py|textproc/py-elasticsearch|2017-12-21|Rename to match PyPI naming japanese/egg-canna||2017-12-25|Has expired: Requires Emacs versions before 23 editors/tree-widget||2017-12-26|Has expired: Now part of Emacs +www/py-flup|www/py-flup6|2017-12-26|forked, for py3k support Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Tue Dec 26 18:26:08 2017 (r457299) +++ head/www/Makefile Tue Dec 26 18:33:18 2017 (r457300) @@ -1683,7 +1683,7 @@ SUBDIR += py-flask-uploads SUBDIR += py-flask-wtf SUBDIR += py-flexget - SUBDIR += py-flup + SUBDIR += py-flup6 SUBDIR += py-formalchemy SUBDIR += py-formencode SUBDIR += py-frappe-bench Modified: head/www/py-flup6/Makefile ============================================================================== --- head/www/py-flup/Makefile Tue Dec 26 18:26:08 2017 (r457299) +++ head/www/py-flup6/Makefile Tue Dec 26 18:33:18 2017 (r457300) @@ -1,18 +1,18 @@ -# Created by: Li-Wen Hsu <lwhsu@lwhsu.org> # $FreeBSD$ -PORTNAME= flup -PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTNAME= flup6 +PORTVERSION= 1.1.1 CATEGORIES= www python -MASTER_SITES= http://www.saddi.com/software/flup/dist/ \ - CHEESESHOP +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= lwhsu@FreeBSD.org -COMMENT= Random assortment of WSGI servers, middleware +MAINTAINER= FreeBSD@Shaneware.biz +COMMENT= Random assortment of WSGI servers -USES= python:2.7 +LICENSE= BSD2CLAUSE + +USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include <bsd.port.mk> Modified: head/www/py-flup6/distinfo ============================================================================== --- head/www/py-flup/distinfo Tue Dec 26 18:26:08 2017 (r457299) +++ head/www/py-flup6/distinfo Tue Dec 26 18:33:18 2017 (r457300) @@ -1,2 +1,3 @@ -SHA256 (flup-1.0.2.tar.gz) = 4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9 -SIZE (flup-1.0.2.tar.gz) = 49051 +TIMESTAMP = 1513265989 +SHA256 (flup6-1.1.1.tar.gz) = fd034c6862a320b9f8176a14fa94e05d67d59e61359c34c6dabd0d31a26a4084 +SIZE (flup6-1.1.1.tar.gz) = 45810 Added: head/www/py-flup6/files/patch-flup_server_ajp__base.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-flup6/files/patch-flup_server_ajp__base.py Tue Dec 26 18:33:18 2017 (r457300) @@ -0,0 +1,15 @@ +--- flup/server/ajp_base.py.orig 2017-12-16 07:40:39 UTC ++++ flup/server/ajp_base.py +@@ -38,7 +38,11 @@ import datetime + import time + + # Unfortunately, for now, threads are required. +-import thread ++try: ++ import thread ++except: ++ import _thread as thread ++ + import threading + + __all__ = ['BaseAJPServer'] Added: head/www/py-flup6/files/patch-flup_server_fcgi__base.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-flup6/files/patch-flup_server_fcgi__base.py Tue Dec 26 18:33:18 2017 (r457300) @@ -0,0 +1,32 @@ +--- flup/server/fcgi_base.py 2015-08-01 02:01:48 UTC ++++ flup/server/fcgi_base.py +@@ -49,9 +49,11 @@ thread_available = True + if sys.hexversion >= 0x03000000: + text_type = str + force_str = lambda s: s.decode('latin-1') ++ py3k = True + else: + text_type = unicode + force_str = lambda s: s ++ py3k = False + + # Apparently 2.3 doesn't define SHUT_WR? Assume it is 1 in this case. + if not hasattr(socket, 'SHUT_WR'): +@@ -601,9 +603,14 @@ class CGIRequest(Request): + + self.server = server + self.params = dict(os.environ) +- self.stdin = sys.stdin.buffer +- self.stdout = StdoutWrapper(sys.stdout.buffer) # Oh, the humanity! +- self.stderr = sys.stderr.buffer ++ if py3k: ++ self.stdin = sys.stdin.buffer ++ self.stdout = StdoutWrapper(sys.stdout.buffer) # Oh, the humanity! ++ self.stderr = sys.stderr.buffer ++ else: ++ self.stdin = sys.stdin ++ self.stdout = StdoutWrapper(sys.stdout) # Oh, the humanity! ++ self.stderr = sys.stderr + self.data = BytesIO() + + def _end(self, appStatus=0, protocolStatus=FCGI_REQUEST_COMPLETE): Added: head/www/py-flup6/files/patch-flup_server_scgi__base.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-flup6/files/patch-flup_server_scgi__base.py Tue Dec 26 18:33:18 2017 (r457300) @@ -0,0 +1,24 @@ +--- flup/server/scgi_base.py.orig 2017-12-16 07:40:10 UTC ++++ flup/server/scgi_base.py +@@ -32,7 +32,7 @@ import logging + import socket + import select + import errno +-import cStringIO as StringIO ++import io as StringIO + import signal + import datetime + import os +@@ -40,7 +40,11 @@ import warnings + + # Threads are required. If you want a non-threaded (forking) version, look at + # SWAP <http://www.idyll.org/~t/www-tools/wsgi/>. +-import thread ++try: ++ import thread ++except: ++ import _thread as thread ++ + import threading + + __all__ = ['BaseSCGIServer'] Modified: head/www/py-flup6/pkg-descr ============================================================================== --- head/www/py-flup/pkg-descr Tue Dec 26 18:26:08 2017 (r457299) +++ head/www/py-flup6/pkg-descr Tue Dec 26 18:33:18 2017 (r457300) @@ -1,10 +1,6 @@ This Python package is a random collection of WSGI modules -written by Allan Saddi. -flup is functionally divided into three components: +It is a fork of Allan Saddi's flup package, and is intended to +support both python2 and python3 from a single code base. - * FlupServers - * FlupMiddleware - * FlupPublisher - -WWW: http://www.saddi.com/software/flup/ +WWW: https://bitbucket.org/denisenkom/flup
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712261833.vBQIXIPX028184>