summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin A. Shelton2016-03-23 15:19:40 -0600
committerBenjamin A. Shelton2016-03-23 15:19:40 -0600
commitf27a7cd34e698c1254ddbfb2aa6c88033b8e8087 (patch)
tree2e2bc008e93b74cb5bdb656392ae0fb291154943
parent8ac7e290bc2eecd09d58aff074ba1a75804582b8 (diff)
downloadaur-f27a7cd34e698c1254ddbfb2aa6c88033b8e8087.tar.gz
Gevent 1.1.0 no longer accepts integers as header arguments in its implementation of pywsgi.
-rw-r--r--PKGBUILD24
-rw-r--r--gevent-110-no-int-header.patch24
2 files changed, 42 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 8c6b21f838d1..7f53e5dba951 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,33 @@
pkgname=python2-gevent-socketio
pkgver=0.3.6
-pkgrel=2
+pkgrel=3
pkgdesc="SocketIO server based on the gevent pywsgi server, a Python network library."
arch=(any)
url="http://pypi.python.org/pypi/gevent-socketio"
license=(BSD)
depends=(python2 python2-gevent python2-gevent-websocket)
makedepends=(python2-setuptools)
-source=("https://pypi.python.org/packages/source/g/gevent-socketio/gevent-socketio-${pkgver}.tar.gz")
-md5sums=(33f745d74885366a07da516c000854b6)
+source=(
+ "https://pypi.python.org/packages/source/g/gevent-socketio/gevent-socketio-${pkgver}.tar.gz"
+ 'gevent-110-no-int-header.patch'
+)
+md5sums=(
+ 33f745d74885366a07da516c000854b6
+ 87a9efb9d61ebca90810901d708ae9e2
+)
package () {
-
cd "${srcdir}/gevent-socketio-${pkgver}"
- python2 setup.py install --root="${pkgdir}/" --optimize=1
- install -Dm0644 "${srcdir}/gevent-socketio-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ # Workaround for https://github.com/abourget/gevent-socketio/issues/223
+ # as reported by Alan Beale.
+ #
+ # References:
+ # https://github.com/abourget/gevent-socketio/pull/221
+ # https://github.com/abourget/gevent-socketio/pull/237
+ patch -p1 -i ../gevent-110-no-int-header.patch
+ python2 setup.py install --root="${pkgdir}/" --optimize=1
+ install -Dm0644 "${srcdir}/gevent-socketio-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/gevent-110-no-int-header.patch b/gevent-110-no-int-header.patch
new file mode 100644
index 000000000000..92cb9480adfb
--- /dev/null
+++ b/gevent-110-no-int-header.patch
@@ -0,0 +1,24 @@
+diff -ur gevent-socketio-0.3.6/socketio/handler.py gevent-socketio-0.3.6.orig/socketio/handler.py
+--- gevent-socketio-0.3.6/socketio/handler.py 2016-03-23 15:06:17.311727069 -0600
++++ gevent-socketio-0.3.6.orig/socketio/handler.py 2014-02-02 22:03:25.000000000 -0700
+@@ -74,7 +74,7 @@
+ ("Access-Control-Allow-Origin", self.environ.get('HTTP_ORIGIN', '*')),
+ ("Access-Control-Allow-Credentials", "true"),
+ ("Access-Control-Allow-Methods", "POST, GET, OPTIONS"),
+- ("Access-Control-Max-Age", 3600),
++ ("Access-Control-Max-Age", "3600"),
+ ("Content-Type", "text/plain"),
+ ])
+ self.result = [data]
+diff -ur gevent-socketio-0.3.6/socketio/transports.py gevent-socketio-0.3.6.orig/socketio/transports.py
+--- gevent-socketio-0.3.6/socketio/transports.py 2016-03-23 15:06:29.674636377 -0600
++++ gevent-socketio-0.3.6.orig/socketio/transports.py 2014-02-02 22:03:25.000000000 -0700
+@@ -21,7 +21,7 @@
+ ("Access-Control-Allow-Origin", "*"),
+ ("Access-Control-Allow-Credentials", "true"),
+ ("Access-Control-Allow-Methods", "POST, GET, OPTIONS"),
+- ("Access-Control-Max-Age", 3600),
++ ("Access-Control-Max-Age", "3600"),
+ ]
+ self.handler = handler
+ self.config = config