diff options
| author | bsiegert <bsiegert> | 2012-04-07 14:48:11 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2012-04-07 14:48:11 +0000 |
| commit | b8574d921d3e4ca2d9c8fda130dea846a0b804fb (patch) | |
| tree | 423dae4e8f37315f1abf63537f8a4ab169148c06 /sysutils/xentools33 | |
| parent | 2853de6dd921c5d05f5dbcdb214b546837fc7d4e (diff) | |
| download | pkgsrc-b8574d921d3e4ca2d9c8fda130dea846a0b804fb.tar.gz | |
Forgot to "cvs add" the patches. Also remove some debugging dreg.
Reminded by wiz, thanks!
Diffstat (limited to 'sysutils/xentools33')
| -rw-r--r-- | sysutils/xentools33/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py | 26 | ||||
| -rw-r--r-- | sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py | 14 |
3 files changed, 43 insertions, 3 deletions
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index d2790308e69..118151cf475 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2012/04/07 13:10:56 bsiegert Exp $ +# $NetBSD: Makefile,v 1.32 2012/04/07 14:48:11 bsiegert Exp $ # VERSION= 3.3.2 @@ -24,8 +24,8 @@ BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware PKG_SYSCONFSUBDIR= xen -#ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 -#ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 +ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 CONFLICTS+= libxen-[0-9]* CONFLICTS+= xentools20-[0-9]* diff --git a/sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py b/sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py new file mode 100644 index 00000000000..b2c8e1fae53 --- /dev/null +++ b/sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py @@ -0,0 +1,26 @@ +$NetBSD: patch-python_xen_util_xmlrpcclient.py,v 1.1 2012/04/07 14:48:12 bsiegert Exp $ + +--- python/xen/util/xmlrpcclient.py.orig 2012-04-02 21:17:56.000000000 +0000 ++++ python/xen/util/xmlrpcclient.py +@@ -22,6 +22,7 @@ import socket + import string + import xmlrpclib + from types import StringTypes ++from sys import hexversion + + + try: +@@ -54,7 +55,12 @@ class UnixTransport(xmlrpclib.Transport) + return xmlrpclib.Transport.request(self, host, '/RPC2', + request_body, verbose) + def make_connection(self, host): +- return HTTPUnix(self.__handler) ++ if hexversion < 0x02070000: ++ # python 2.6 or earlier ++ return HTTPUnix(self.__handler) ++ else: ++ # xmlrpclib.Transport changed in python 2.7 ++ return HTTPUnixConnection(self.__handler) + + + # We need our own transport for HTTPS, because xmlrpclib.SafeTransport is diff --git a/sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py b/sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py new file mode 100644 index 00000000000..29c2fc45d57 --- /dev/null +++ b/sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py @@ -0,0 +1,14 @@ +$NetBSD: patch-python_xen_util_xmlrpclib2.py,v 1.1 2012/04/07 14:48:12 bsiegert Exp $ + +--- python/xen/util/xmlrpclib2.py.orig 2012-04-02 21:20:21.000000000 +0000 ++++ python/xen/util/xmlrpclib2.py +@@ -58,6 +58,9 @@ def stringify(value): + # some bugs in Keep-Alive handling and also enabled it by default + class XMLRPCRequestHandler(SimpleXMLRPCRequestHandler): + protocol_version = "HTTP/1.1" ++ # xend crashes in python 2.7 unless disable_nagle_algorithm = False ++ # it isn't used in earlier versions so it is harmless to set it generally ++ disable_nagle_algorithm = False + + def __init__(self, hosts_allowed, request, client_address, server): + self.hosts_allowed = hosts_allowed |