[pkgsrc/pkgsrc-2012Q1]: pkgsrc/sysutils/xentools33 Pullup ticket #3707 - requ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af8fe5430308
branches:  pkgsrc-2012Q1
changeset: 601992:af8fe5430308
user:      spz <spz%pkgsrc.org@localhost>
date:      Sat Apr 07 20:31:10 2012 +0000

description:
Pullup ticket #3707 - requested by bsiegert
sysutils/xentools33: build fix

Revisions pulled up:
- sysutils/xentools33/Makefile                                  1.32
- sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py 1.1
- sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py 1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Sat Apr  7 14:48:12 UTC 2012

   Modified Files:
           pkgsrc/sysutils/xentools33: Makefile
   Added Files:
           pkgsrc/sysutils/xentools33/patches:
               patch-python_xen_util_xmlrpcclient.py
               patch-python_xen_util_xmlrpclib2.py

   Log Message:
   Forgot to "cvs add" the patches. Also remove some debugging dreg.

   Reminded by wiz, thanks!


   To generate a diff of this commit:
   cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/xentools33/Makefile
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py \
       pkgsrc/sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py

diffstat:

 sysutils/xentools33/Makefile                                      |   6 +-
 sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py |  26 ++++++++++
 sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py   |  14 +++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r 1eddcfc7de33 -r af8fe5430308 sysutils/xentools33/Makefile
--- a/sysutils/xentools33/Makefile      Sat Apr 07 15:01:55 2012 +0000
+++ b/sysutils/xentools33/Makefile      Sat Apr 07 20:31:10 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/04/07 13:10:56 bsiegert Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2012/04/07 20:31:10 spz Exp $
 #
 
 VERSION=               3.3.2
@@ -24,8 +24,8 @@
 
 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 -r 1eddcfc7de33 -r af8fe5430308 sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py Sat Apr 07 20:31:10 2012 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-python_xen_util_xmlrpcclient.py,v 1.1.2.2 2012/04/07 20:31:10 spz 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 -r 1eddcfc7de33 -r af8fe5430308 sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py   Sat Apr 07 20:31:10 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-python_xen_util_xmlrpclib2.py,v 1.1.2.2 2012/04/07 20:31:10 spz 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