Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 4 commits
  • 9 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 07, 2012
spz 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
bc15b4c
spz adjust name of the CHANGES file (tools depend on it)
note pullup 3707
bac4ea5
spz Pullup ticket #3709 - requested by joerg
security/oath-toolkit: build fix

Revisions pulled up:
- security/oath-toolkit/patches/patch-liboath_gl_fflush.c       1.1
- security/oath-toolkit/patches/patch-liboath_gl_fflush.c.diff  deleted
- security/oath-toolkit/patches/patch-liboath_gl_fseeko.c       1.1
- security/oath-toolkit/patches/patch-liboath_gl_fseeko.c.diff  deleted

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat Apr  7 19:34:16 UTC 2012

   Added Files:
   	pkgsrc/security/oath-toolkit/patches: patch-liboath_gl_fflush.c
   	    patch-liboath_gl_fseeko.c
   Removed Files:
   	pkgsrc/security/oath-toolkit/patches: patch-liboath_gl_fflush.c.diff
   	    patch-liboath_gl_fseeko.c.diff

   Log Message:
   Apply patches as intended.


   To generate a diff of this commit:
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fflush.c \
       pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fseeko.c
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fflush.c.diff \
       pkgsrc/security/oath-toolkit/patches/patch-liboath_gl_fseeko.c.diff
0022a97
spz pullup 3709 744f435
View
4 doc/CHANGES-2012Q1
@@ -1,4 +0,0 @@
-$NetBSD: CHANGES-2012Q1,v 1.1.2.1 2012/04/07 15:01:55 wiz Exp $
-
-Changes to the packages collection and infrastructure in 2012Q1:
-
View
9 doc/CHANGES-pkgsrc-2012Q1
@@ -0,0 +1,9 @@
+$NetBSD: CHANGES-pkgsrc-2012Q1,v 1.1.2.2 2012/04/07 21:01:01 spz Exp $
+
+Changes to the packages collection and infrastructure in pkgsrc-2012Q1:
+
+Pullup ticket #3707 - requested by bsiegert
+sysutils/xentools33: build fix
+Pullup ticket #3709 - requested by joerg
+security/oath-toolkit: build fix
+
View
13 security/oath-toolkit/patches/patch-liboath_gl_fflush.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-liboath_gl_fflush.c,v 1.1.2.2 2012/04/07 20:59:51 spz Exp $
+
+--- liboath/gl/fflush.c.orig 2012-01-03 19:18:22.000000000 +0000
++++ liboath/gl/fflush.c
+@@ -91,7 +91,7 @@ static inline void
+ update_fpos_cache (FILE *fp, off_t pos)
+ {
+ #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__NetBSD__)
+ /* fp_->_offset is typed as an integer. */
+ fp_->_offset = pos;
+ # else
View
16 security/oath-toolkit/patches/patch-liboath_gl_fflush.c.diff
@@ -1,16 +0,0 @@
---- security/oath-toolkit/patches/patch-liboath_gl_fflush.c
-+++ security/oath-toolkit/patches/patch-liboath_gl_fflush.c
-@@ -0,0 +1,13 @@
-+$NetBSD: patch-liboath_gl_fflush.c.diff,v 1.1 2012/04/07 13:16:24 joerg Exp $
-+
-+--- liboath/gl/fflush.c.orig 2012-01-03 19:18:22.000000000 +0000
-++++ liboath/gl/fflush.c
-+@@ -91,7 +91,7 @@ static inline void
-+ update_fpos_cache (FILE *fp, off_t pos)
-+ {
-+ #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
-+-# if defined __CYGWIN__
-++# if defined(__CYGWIN__) || defined(__NetBSD__)
-+ /* fp_->_offset is typed as an integer. */
-+ fp_->_offset = pos;
-+ # else
View
13 security/oath-toolkit/patches/patch-liboath_gl_fseeko.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-liboath_gl_fseeko.c,v 1.1.2.2 2012/04/07 20:59:51 spz Exp $
+
+--- liboath/gl/fseeko.c.orig 2012-01-03 19:18:22.000000000 +0000
++++ liboath/gl/fseeko.c
+@@ -109,7 +109,7 @@ fseeko (FILE *fp, off_t offset, int when
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__NetBSD__)
+ /* fp_->_offset is typed as an integer. */
+ fp_->_offset = pos;
+ # else
View
16 security/oath-toolkit/patches/patch-liboath_gl_fseeko.c.diff
@@ -1,16 +0,0 @@
---- security/oath-toolkit/patches/patch-liboath_gl_fseeko.c
-+++ security/oath-toolkit/patches/patch-liboath_gl_fseeko.c
-@@ -0,0 +1,13 @@
-+$NetBSD: patch-liboath_gl_fseeko.c.diff,v 1.1 2012/04/07 13:16:24 joerg Exp $
-+
-+--- liboath/gl/fseeko.c.orig 2012-01-03 19:18:22.000000000 +0000
-++++ liboath/gl/fseeko.c
-+@@ -109,7 +109,7 @@ fseeko (FILE *fp, off_t offset, int when
-+ fp->_flags &= ~_IO_EOF_SEEN;
-+ fp->_offset = pos;
-+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
-+-# if defined __CYGWIN__
-++# if defined(__CYGWIN__) || defined(__NetBSD__)
-+ /* fp_->_offset is typed as an integer. */
-+ fp_->_offset = pos;
-+ # else
View
6 sysutils/xentools33/Makefile
@@ -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 @@ 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]*
View
26 sysutils/xentools33/patches/patch-python_xen_util_xmlrpcclient.py
@@ -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
View
14 sysutils/xentools33/patches/patch-python_xen_util_xmlrpclib2.py
@@ -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

No commit comments for this range

Something went wrong with that request. Please try again.