[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.0.6-1-1-g588ac22
Iustin Pop
iustin at debian.org
Thu Mar 11 19:42:21 UTC 2010
The following commit has been merged in the master branch:
commit 588ac22fddafd8917c7a27fdb9e9c1e322c531d9
Author: Iustin Pop <iustin at debian.org>
Date: Thu Mar 11 19:23:27 2010 +0100
New release with patches from upstream
diff --git a/debian/changelog b/debian/changelog
index f34d69d..3249362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ganeti (2.0.6-2) unstable; urgency=low
+
+ * Cherry-pick three patches from upstream:
+ * Fix two potentially endless loops in http library
+ * KVM: Fix unintended qemu-level bridging of nics
+ * Fix python 2.6.5 compatibility
+
+ -- Iustin Pop <iustin at debian.org> Thu, 11 Mar 2010 19:22:17 +0100
+
ganeti (2.0.6-1) unstable; urgency=low
* New upstream version (Closes: #568105, thanks Elmar Hoffmann!)
diff --git a/debian/patches/fix-http-loops.patch b/debian/patches/fix-http-loops.patch
new file mode 100644
index 0000000..d829624
--- /dev/null
+++ b/debian/patches/fix-http-loops.patch
@@ -0,0 +1,47 @@
+From: Michael Hanselmann <hansmi at google.com>
+Date: Fri, 26 Feb 2010 12:32:11 +0000 (+0100)
+Subject: Fix two potentially endless loops in http library
+X-Git-Url: http://git.ganeti.org/?p=ganeti.git;a=commitdiff_plain;h=0be13136629b5f1a90ded406531c9b78c9c9345a
+
+Fix two potentially endless loops in http library
+
+The first can be problematic if poll(2) returns POLLHUP|POLLERR on a
+socket. Before it would be only be respected for SOCKOP_RECV, but since
+they can also occur on other socket operations, esp. in combination with
+OpenSSL, letting the socket functions handle POLLHUP|POLLERR seems to be
+the right thing.
+
+The second is a typo leading to an endless loop if the first line of an
+HTTP connection is empty (simply "\r\n"). Instead of removing the empty
+line, it would remove anything after it.
+
+Signed-off-by: Michael Hanselmann <hansmi at google.com>
+Reviewed-by: Iustin Pop <iustin at google.com>
+---
+
+diff --git a/lib/http/__init__.py b/lib/http/__init__.py
+index ce2243a..b39866a 100644
+--- a/lib/http/__init__.py
++++ b/lib/http/__init__.py
+@@ -401,9 +401,9 @@ def SocketOperation(sock, op, arg1, timeout):
+ if event is None:
+ raise HttpSocketTimeout()
+
+- if (op == SOCKOP_RECV and
+- event & (select.POLLNVAL | select.POLLHUP | select.POLLERR)):
+- return ""
++ if event & (select.POLLNVAL | select.POLLHUP | select.POLLERR):
++ # Let the socket functions handle these
++ break
+
+ if not event & wait_for_event:
+ continue
+@@ -845,7 +845,7 @@ class HttpMessageReader(object):
+ # the CRLF."
+ if idx == 0:
+ # TODO: Limit number of CRLFs/empty lines for safety?
+- buf = buf[:2]
++ buf = buf[2:]
+ continue
+
+ if idx > 0:
diff --git a/debian/patches/fix-kvm-bridging.patch b/debian/patches/fix-kvm-bridging.patch
new file mode 100644
index 0000000..edd49ce
--- /dev/null
+++ b/debian/patches/fix-kvm-bridging.patch
@@ -0,0 +1,36 @@
+From: Timothy Kuhlman <timkuhlman at gmail.com>
+Date: Mon, 8 Mar 2010 15:43:40 +0000 (+0000)
+Subject: KVM: Fix unintended qemu-level bridging of nics
+X-Git-Url: http://git.ganeti.org/?p=ganeti.git;a=commitdiff_plain;h=1e9823c462955453f036ba8d8ece1434342888e7
+
+KVM: Fix unintended qemu-level bridging of nics
+
+Each nic should be connected to its own qemu vlan, to avoid them all
+bridging together.
+
+Signed-off-by: Timothy Kuhlman <timkuhlman at gmail.com>
+Reviewed-by: Guido Trotter <ultrotter at google.com>
+Signed-off-by: Guido Trotter <ultrotter at google.com>
+Reviewed-by: Iustin Pop <iustin at google.com>
+(cherry picked from commit 760570a8ae286c3b46add2074aa9323e93f3a509)
+
+Signed-off-by: Iustin Pop <iustin at google.com>
+---
+
+diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
+index fda2987..d4607e2 100644
+--- a/lib/hypervisor/hv_kvm.py
++++ b/lib/hypervisor/hv_kvm.py
+@@ -412,10 +412,10 @@ class KVMHypervisor(hv_base.BaseHypervisor):
+ nic_model = "model=%s" % nic_type
+
+ for nic_seq, nic in enumerate(kvm_nics):
+- nic_val = "nic,macaddr=%s,%s" % (nic.mac, nic_model)
++ nic_val = "nic,vlan=%s,macaddr=%s,%s" % (nic_seq, nic.mac, nic_model)
+ script = self._WriteNetScript(instance, nic_seq, nic)
+ kvm_cmd.extend(['-net', nic_val])
+- kvm_cmd.extend(['-net', 'tap,script=%s' % script])
++ kvm_cmd.extend(['-net', 'tap,vlan=%s,script=%s' % (nic_seq, script)])
+ temp_files.append(script)
+
+ if incoming:
diff --git a/debian/patches/fix-python-2.6.5.patch b/debian/patches/fix-python-2.6.5.patch
new file mode 100644
index 0000000..d902aff
--- /dev/null
+++ b/debian/patches/fix-python-2.6.5.patch
@@ -0,0 +1,34 @@
+From: Iustin Pop <iustin at google.com>
+Date: Wed, 10 Mar 2010 10:25:31 +0000 (+0100)
+Subject: Fix a python 2.6.5 compatibility
+X-Git-Url: http://git.ganeti.org/?p=ganeti.git;a=commitdiff_plain;h=6a180ca8d18005ded4cbf6c13e877ebcfc84a275
+
+Fix a python 2.6.5 compatibility
+
+The upcoming python 2.6.5 release has a change that makes delattr(obj,
+attr) fail for slots-enabled objects if the attr is not already set.
+
+To prevent against this, we only run the delattr if the attribute is
+already set.
+
+Signed-off-by: Iustin Pop <iustin at google.com>
+Reviewed-by: Guido Trotter <ultrotter at google.com>
+(cherry-picked from 44db3a6f466a2cd10d3719c29985a5eb740e341d)
+
+Signed-off-by: Iustin Pop <iustin at google.com>
+Reviewed-by: Michael Hanselmann <hansmi at google.com>
+---
+
+diff --git a/lib/opcodes.py b/lib/opcodes.py
+index 6a86477..f3142e1 100644
+--- a/lib/opcodes.py
++++ b/lib/opcodes.py
+@@ -89,7 +89,7 @@ class BaseOpCode(object):
+ type(state))
+
+ for name in self.__slots__:
+- if name not in state:
++ if name not in state and hasattr(self, name):
+ delattr(self, name)
+
+ for name in state:
diff --git a/debian/patches/series b/debian/patches/series
index 752acb4..76e4e02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
fix-gnt-cluster-manpage.patch
hostname-fqdn.patch
fix-startup-with-old-config.patch
+fix-http-loops.patch
+fix-kvm-bridging.patch
+fix-python-2.6.5.patch
--
Ganeti packaging
More information about the Pkg-ganeti-devel
mailing list