Patchwork [meta-oe] python-tornado: Updated to version 3.1.1

login
register
mail settings
Submitter Dan McDougall
Date Nov. 19, 2013, 7:18 p.m.
Message ID <1384888696-21678-1-git-send-email-daniel.mcdougall@liftoffsoftware.com>
Download mbox | patch
Permalink /patch/61985/
State Not Applicable, archived
Headers show

Comments

Dan McDougall - Nov. 19, 2013, 7:18 p.m.
The sole patch for this package is no longer necessary and has been
removed.

Signed-off-by: Dan McDougall <daniel.mcdougall@liftoffsoftware.com>
---
 .../0001-disable-AI_ADDRCONFIG-flag.patch          | 32 ----------------------
 .../recipes-devtools/python/python-tornado_git.bb  |  9 +++---
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
Martin Jansa - Nov. 20, 2013, 4:38 p.m.
On Tue, Nov 19, 2013 at 07:18:16PM +0000, Dan McDougall wrote:
> The sole patch for this package is no longer necessary and has been
> removed.

Also doesn't apply, meta-oe has 2.2.1 for few months already

commit 14102819f4d748eeb4df43f9e07d369fab3f5e26
Author:     Koen Kooi <koen@dominion.thruhere.net>
AuthorDate: Fri Apr 12 10:04:43 2013 +0000
Commit:     Martin Jansa <Martin.Jansa@gmail.com>
CommitDate: Mon Apr 15 16:16:52 2013 +0200

    python-tornado: update to top of 2.2 branch


> 
> Signed-off-by: Dan McDougall <daniel.mcdougall@liftoffsoftware.com>
> ---
>  .../0001-disable-AI_ADDRCONFIG-flag.patch          | 32 ----------------------
>  .../recipes-devtools/python/python-tornado_git.bb  |  9 +++---
>  2 files changed, 4 insertions(+), 37 deletions(-)
>  delete mode 100644 meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
> 
> diff --git a/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch b/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
> deleted file mode 100644
> index 3c3ec7c..0000000
> --- a/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From d7fb0a6ef3f3cbdfc1f21f5a67d54fa9d2c1e183 Mon Sep 17 00:00:00 2001
> -From: Koen Kooi <koen@dominion.thruhere.net>
> -Date: Wed, 2 Nov 2011 11:07:24 +0100
> -Subject: [PATCH] disable AI_ADDRCONFIG flag
> -
> -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> -
> -Upstream-status: unknown
> ----
> - tornado/netutil.py |    6 ------
> - 1 files changed, 0 insertions(+), 6 deletions(-)
> -
> -diff --git a/tornado/netutil.py b/tornado/netutil.py
> -index cfff0ba..c181f24 100644
> ---- a/tornado/netutil.py
> -+++ b/tornado/netutil.py
> -@@ -238,12 +238,6 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128):
> -     if address == "":
> -         address = None
> -     flags = socket.AI_PASSIVE
> --    if hasattr(socket, "AI_ADDRCONFIG"):
> --        # AI_ADDRCONFIG ensures that we only try to bind on ipv6
> --        # if the system is configured for it, but the flag doesn't
> --        # exist on some platforms (specifically WinXP, although
> --        # newer versions of windows have it)
> --        flags |= socket.AI_ADDRCONFIG
> -     for res in set(socket.getaddrinfo(address, port, family, socket.SOCK_STREAM,
> -                                   0, flags):
> -         af, socktype, proto, canonname, sockaddr = res
> --- 
> -1.7.2.5
> -
> diff --git a/meta-oe/recipes-devtools/python/python-tornado_git.bb b/meta-oe/recipes-devtools/python/python-tornado_git.bb
> index 82a94e6..e51ce3c 100644
> --- a/meta-oe/recipes-devtools/python/python-tornado_git.bb
> +++ b/meta-oe/recipes-devtools/python/python-tornado_git.bb
> @@ -1,12 +1,11 @@
>  DESCRIPTION = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed."
>  LICENSE = "Apache"
> -LIC_FILES_CHKSUM = "file://README;md5=e7fb9954003d7cd93322ccf282210d1c"
> +LIC_FILES_CHKSUM = "file://README.rst;md5=b34308b7b58b086690bf3d59ea9f3b28"
>  
> -PV = "2.2"
> +PV = "3.1.1"
>  PR = "r1"
> -SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505"
> -SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \
> -           file://0001-disable-AI_ADDRCONFIG-flag.patch \
> +SRCREV = "495c94f6329e457bc5678e4aa38c228f8e93a4c8"
> +SRC_URI = "git://github.com/facebook/tornado.git;branch=branch3.1 \
>            "
>  
>  S = "${WORKDIR}/git"
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch b/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
deleted file mode 100644
index 3c3ec7c..0000000
--- a/meta-oe/recipes-devtools/python/python-tornado/0001-disable-AI_ADDRCONFIG-flag.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From d7fb0a6ef3f3cbdfc1f21f5a67d54fa9d2c1e183 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 2 Nov 2011 11:07:24 +0100
-Subject: [PATCH] disable AI_ADDRCONFIG flag
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-Upstream-status: unknown
----
- tornado/netutil.py |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/tornado/netutil.py b/tornado/netutil.py
-index cfff0ba..c181f24 100644
---- a/tornado/netutil.py
-+++ b/tornado/netutil.py
-@@ -238,12 +238,6 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128):
-     if address == "":
-         address = None
-     flags = socket.AI_PASSIVE
--    if hasattr(socket, "AI_ADDRCONFIG"):
--        # AI_ADDRCONFIG ensures that we only try to bind on ipv6
--        # if the system is configured for it, but the flag doesn't
--        # exist on some platforms (specifically WinXP, although
--        # newer versions of windows have it)
--        flags |= socket.AI_ADDRCONFIG
-     for res in set(socket.getaddrinfo(address, port, family, socket.SOCK_STREAM,
-                                   0, flags):
-         af, socktype, proto, canonname, sockaddr = res
--- 
-1.7.2.5
-
diff --git a/meta-oe/recipes-devtools/python/python-tornado_git.bb b/meta-oe/recipes-devtools/python/python-tornado_git.bb
index 82a94e6..e51ce3c 100644
--- a/meta-oe/recipes-devtools/python/python-tornado_git.bb
+++ b/meta-oe/recipes-devtools/python/python-tornado_git.bb
@@ -1,12 +1,11 @@ 
 DESCRIPTION = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed."
 LICENSE = "Apache"
-LIC_FILES_CHKSUM = "file://README;md5=e7fb9954003d7cd93322ccf282210d1c"
+LIC_FILES_CHKSUM = "file://README.rst;md5=b34308b7b58b086690bf3d59ea9f3b28"
 
-PV = "2.2"
+PV = "3.1.1"
 PR = "r1"
-SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505"
-SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \
-           file://0001-disable-AI_ADDRCONFIG-flag.patch \
+SRCREV = "495c94f6329e457bc5678e4aa38c228f8e93a4c8"
+SRC_URI = "git://github.com/facebook/tornado.git;branch=branch3.1 \
           "
 
 S = "${WORKDIR}/git"